diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs
index b4b4b8ff0f23..aafa69a988d3 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperations.cs
@@ -54,7 +54,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// List all certificate orders in a subscription.
         /// </summary>
         /// <remarks>
-        /// List all certificate orders in a subscription.
+        /// Description for List all certificate orders in a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +83,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +94,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +102,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.CertificateRegistration/certificateOrders").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -228,7 +230,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Validate information for a certificate order.
         /// </summary>
         /// <remarks>
-        /// Validate information for a certificate order.
+        /// Description for Validate information for a certificate order.
         /// </remarks>
         /// <param name='appServiceCertificateOrder'>
         /// Information for a certificate order.
@@ -239,7 +241,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -265,7 +267,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -274,7 +279,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("appServiceCertificateOrder", appServiceCertificateOrder);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ValidatePurchaseInformation", tracingParameters);
             }
@@ -283,9 +287,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.CertificateRegistration/validateCertificateRegistrationInformation").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -353,14 +357,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -370,10 +373,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -404,7 +403,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Get certificate orders in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get certificate orders in a resource group.
+        /// Description for Get certificate orders in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -455,7 +454,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -464,7 +466,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -474,9 +475,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -602,7 +603,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Get a certificate order.
         /// </summary>
         /// <remarks>
-        /// Get a certificate order.
+        /// Description for Get a certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -660,7 +661,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -670,7 +674,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -681,9 +684,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -809,7 +812,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -837,7 +840,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Delete an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Delete an existing certificate order.
+        /// Description for Delete an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -851,7 +854,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -892,7 +895,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -902,7 +908,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters);
             }
@@ -913,9 +918,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -977,14 +982,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -994,10 +998,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -1028,7 +1028,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1093,7 +1093,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1104,7 +1107,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("certificateDistinguishedName", certificateDistinguishedName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -1115,9 +1117,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1267,7 +1269,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// List all certificates associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// List all certificates associated with a certificate order.
+        /// Description for List all certificates associated with a certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1325,7 +1327,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1335,7 +1340,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListCertificates", tracingParameters);
             }
@@ -1346,9 +1350,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1474,7 +1478,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Get the certificate associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// Get the certificate associated with a certificate order.
+        /// Description for Get the certificate associated with a certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1539,7 +1543,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1550,7 +1557,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetCertificate", tracingParameters);
             }
@@ -1562,9 +1568,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1690,7 +1696,8 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Creates or updates a certificate and associates with key vault secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault secret.
+        /// Description for Creates or updates a certificate and associates with key
+        /// vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1721,7 +1728,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Delete the certificate associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// Delete the certificate associated with a certificate order.
+        /// Description for Delete the certificate associated with a certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1738,7 +1745,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1783,7 +1790,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1794,7 +1804,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteCertificate", tracingParameters);
             }
@@ -1806,9 +1815,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1870,14 +1879,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1887,10 +1895,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -1921,7 +1925,8 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Creates or updates a certificate and associates with key vault secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault secret.
+        /// Description for Creates or updates a certificate and associates with key
+        /// vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1993,7 +1998,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2005,7 +2013,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("keyVaultCertificate", keyVaultCertificate);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateCertificate", tracingParameters);
             }
@@ -2017,9 +2024,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2169,7 +2176,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Reissue an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Reissue an existing certificate order.
+        /// Description for Reissue an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2186,7 +2193,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2231,7 +2238,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2242,7 +2252,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("reissueCertificateOrderRequest", reissueCertificateOrderRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Reissue", tracingParameters);
             }
@@ -2253,9 +2262,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2323,14 +2332,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2340,10 +2348,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -2374,7 +2378,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Renew an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Renew an existing certificate order.
+        /// Description for Renew an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2391,7 +2395,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2436,7 +2440,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2447,7 +2454,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("renewCertificateOrderRequest", renewCertificateOrderRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Renew", tracingParameters);
             }
@@ -2458,9 +2464,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2528,14 +2534,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2545,10 +2550,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -2579,7 +2580,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Resend certificate email.
         /// </summary>
         /// <remarks>
-        /// Resend certificate email.
+        /// Description for Resend certificate email.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2593,7 +2594,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2634,7 +2635,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2644,7 +2648,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResendEmail", tracingParameters);
             }
@@ -2655,9 +2658,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2719,14 +2722,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2736,10 +2738,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -2770,7 +2768,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2787,7 +2785,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2832,7 +2830,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2843,7 +2844,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("nameIdentifier", nameIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResendRequestEmails", tracingParameters);
             }
@@ -2854,9 +2854,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2924,14 +2924,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2941,10 +2940,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -2975,7 +2970,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3040,7 +3035,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3051,7 +3049,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("siteSealRequest", siteSealRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RetrieveSiteSeal", tracingParameters);
             }
@@ -3062,9 +3059,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3196,7 +3193,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3210,7 +3207,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -3251,7 +3248,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3261,7 +3261,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "VerifyDomainOwnership", tracingParameters);
             }
@@ -3272,9 +3271,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3336,14 +3335,13 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -3353,10 +3351,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient 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);
@@ -3387,7 +3381,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Retrieve the list of certificate actions.
         /// </summary>
         /// <remarks>
-        /// Retrieve the list of certificate actions.
+        /// Description for Retrieve the list of certificate actions.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3445,7 +3439,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3455,7 +3452,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RetrieveCertificateActions", tracingParameters);
             }
@@ -3466,9 +3462,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3594,7 +3590,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Retrieve email history.
         /// </summary>
         /// <remarks>
-        /// Retrieve email history.
+        /// Description for Retrieve email history.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3652,7 +3648,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3662,7 +3661,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RetrieveCertificateEmailHistory", tracingParameters);
             }
@@ -3673,9 +3671,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3801,7 +3799,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3870,7 +3868,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3881,7 +3882,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("certificateDistinguishedName", certificateDistinguishedName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
             }
@@ -3892,9 +3892,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{certificateOrderName}", System.Uri.EscapeDataString(certificateOrderName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4044,7 +4044,8 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Creates or updates a certificate and associates with key vault secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault secret.
+        /// Description for Creates or updates a certificate and associates with key
+        /// vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4120,7 +4121,10 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4132,7 +4136,6 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
                 tracingParameters.Add("certificateOrderName", certificateOrderName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("keyVaultCertificate", keyVaultCertificate);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateCertificate", tracingParameters);
             }
@@ -4144,9 +4147,9 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4296,7 +4299,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// List all certificate orders in a subscription.
         /// </summary>
         /// <remarks>
-        /// List all certificate orders in a subscription.
+        /// Description for List all certificate orders in a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -4467,7 +4470,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// Get certificate orders in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get certificate orders in a resource group.
+        /// Description for Get certificate orders in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -4638,7 +4641,7 @@ internal AppServiceCertificateOrdersOperations(WebSiteManagementClient client)
         /// List all certificates associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// List all certificates associated with a certificate order.
+        /// Description for List all certificates associated with a certificate order.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs
index 4973b62443b5..66512a36d4f3 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceCertificateOrdersOperationsExtensions.cs
@@ -27,7 +27,7 @@ public static partial class AppServiceCertificateOrdersOperationsExtensions
             /// List all certificate orders in a subscription.
             /// </summary>
             /// <remarks>
-            /// List all certificate orders in a subscription.
+            /// Description for List all certificate orders in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -41,7 +41,7 @@ public static IPage<AppServiceCertificateOrder> List(this IAppServiceCertificate
             /// List all certificate orders in a subscription.
             /// </summary>
             /// <remarks>
-            /// List all certificate orders in a subscription.
+            /// Description for List all certificate orders in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -61,7 +61,7 @@ public static IPage<AppServiceCertificateOrder> List(this IAppServiceCertificate
             /// Validate information for a certificate order.
             /// </summary>
             /// <remarks>
-            /// Validate information for a certificate order.
+            /// Description for Validate information for a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -78,7 +78,7 @@ public static void ValidatePurchaseInformation(this IAppServiceCertificateOrders
             /// Validate information for a certificate order.
             /// </summary>
             /// <remarks>
-            /// Validate information for a certificate order.
+            /// Description for Validate information for a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -98,7 +98,7 @@ public static void ValidatePurchaseInformation(this IAppServiceCertificateOrders
             /// Get certificate orders in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get certificate orders in a resource group.
+            /// Description for Get certificate orders in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -115,7 +115,7 @@ public static IPage<AppServiceCertificateOrder> ListByResourceGroup(this IAppSer
             /// Get certificate orders in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get certificate orders in a resource group.
+            /// Description for Get certificate orders in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -138,7 +138,7 @@ public static IPage<AppServiceCertificateOrder> ListByResourceGroup(this IAppSer
             /// Get a certificate order.
             /// </summary>
             /// <remarks>
-            /// Get a certificate order.
+            /// Description for Get a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -158,7 +158,7 @@ public static AppServiceCertificateOrder Get(this IAppServiceCertificateOrdersOp
             /// Get a certificate order.
             /// </summary>
             /// <remarks>
-            /// Get a certificate order.
+            /// Description for Get a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -184,7 +184,7 @@ public static AppServiceCertificateOrder Get(this IAppServiceCertificateOrdersOp
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -207,7 +207,7 @@ public static AppServiceCertificateOrder CreateOrUpdate(this IAppServiceCertific
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -236,7 +236,7 @@ public static AppServiceCertificateOrder CreateOrUpdate(this IAppServiceCertific
             /// Delete an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Delete an existing certificate order.
+            /// Description for Delete an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -256,7 +256,7 @@ public static void Delete(this IAppServiceCertificateOrdersOperations operations
             /// Delete an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Delete an existing certificate order.
+            /// Description for Delete an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -279,7 +279,7 @@ public static void Delete(this IAppServiceCertificateOrdersOperations operations
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -302,7 +302,7 @@ public static AppServiceCertificateOrder Update(this IAppServiceCertificateOrder
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -331,7 +331,7 @@ public static AppServiceCertificateOrder Update(this IAppServiceCertificateOrder
             /// List all certificates associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// List all certificates associated with a certificate order.
+            /// Description for List all certificates associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -351,7 +351,7 @@ public static IPage<AppServiceCertificateResource> ListCertificates(this IAppSer
             /// List all certificates associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// List all certificates associated with a certificate order.
+            /// Description for List all certificates associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -377,7 +377,7 @@ public static IPage<AppServiceCertificateResource> ListCertificates(this IAppSer
             /// Get the certificate associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// Get the certificate associated with a certificate order.
+            /// Description for Get the certificate associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -400,7 +400,7 @@ public static AppServiceCertificateResource GetCertificate(this IAppServiceCerti
             /// Get the certificate associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// Get the certificate associated with a certificate order.
+            /// Description for Get the certificate associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -429,7 +429,8 @@ public static AppServiceCertificateResource GetCertificate(this IAppServiceCerti
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -455,7 +456,8 @@ public static AppServiceCertificateResource CreateOrUpdateCertificate(this IAppS
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -487,7 +489,7 @@ public static AppServiceCertificateResource CreateOrUpdateCertificate(this IAppS
             /// Delete the certificate associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// Delete the certificate associated with a certificate order.
+            /// Description for Delete the certificate associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -510,7 +512,7 @@ public static void DeleteCertificate(this IAppServiceCertificateOrdersOperations
             /// Delete the certificate associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// Delete the certificate associated with a certificate order.
+            /// Description for Delete the certificate associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -536,7 +538,8 @@ public static void DeleteCertificate(this IAppServiceCertificateOrdersOperations
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -562,7 +565,8 @@ public static AppServiceCertificateResource UpdateCertificate(this IAppServiceCe
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -594,7 +598,7 @@ public static AppServiceCertificateResource UpdateCertificate(this IAppServiceCe
             /// Reissue an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Reissue an existing certificate order.
+            /// Description for Reissue an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -617,7 +621,7 @@ public static void Reissue(this IAppServiceCertificateOrdersOperations operation
             /// Reissue an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Reissue an existing certificate order.
+            /// Description for Reissue an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -643,7 +647,7 @@ public static void Reissue(this IAppServiceCertificateOrdersOperations operation
             /// Renew an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Renew an existing certificate order.
+            /// Description for Renew an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -666,7 +670,7 @@ public static void Renew(this IAppServiceCertificateOrdersOperations operations,
             /// Renew an existing certificate order.
             /// </summary>
             /// <remarks>
-            /// Renew an existing certificate order.
+            /// Description for Renew an existing certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -692,7 +696,7 @@ public static void Renew(this IAppServiceCertificateOrdersOperations operations,
             /// Resend certificate email.
             /// </summary>
             /// <remarks>
-            /// Resend certificate email.
+            /// Description for Resend certificate email.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -712,7 +716,7 @@ public static void ResendEmail(this IAppServiceCertificateOrdersOperations opera
             /// Resend certificate email.
             /// </summary>
             /// <remarks>
-            /// Resend certificate email.
+            /// Description for Resend certificate email.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -735,7 +739,7 @@ public static void ResendEmail(this IAppServiceCertificateOrdersOperations opera
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -758,7 +762,7 @@ public static void ResendRequestEmails(this IAppServiceCertificateOrdersOperatio
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -784,7 +788,7 @@ public static void ResendRequestEmails(this IAppServiceCertificateOrdersOperatio
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -807,7 +811,7 @@ public static SiteSeal RetrieveSiteSeal(this IAppServiceCertificateOrdersOperati
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -836,7 +840,7 @@ public static SiteSeal RetrieveSiteSeal(this IAppServiceCertificateOrdersOperati
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -856,7 +860,7 @@ public static void VerifyDomainOwnership(this IAppServiceCertificateOrdersOperat
             /// Verify domain ownership for this certificate order.
             /// </summary>
             /// <remarks>
-            /// Verify domain ownership for this certificate order.
+            /// Description for Verify domain ownership for this certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -879,7 +883,7 @@ public static void VerifyDomainOwnership(this IAppServiceCertificateOrdersOperat
             /// Retrieve the list of certificate actions.
             /// </summary>
             /// <remarks>
-            /// Retrieve the list of certificate actions.
+            /// Description for Retrieve the list of certificate actions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -899,7 +903,7 @@ public static IList<CertificateOrderAction> RetrieveCertificateActions(this IApp
             /// Retrieve the list of certificate actions.
             /// </summary>
             /// <remarks>
-            /// Retrieve the list of certificate actions.
+            /// Description for Retrieve the list of certificate actions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -925,7 +929,7 @@ public static IList<CertificateOrderAction> RetrieveCertificateActions(this IApp
             /// Retrieve email history.
             /// </summary>
             /// <remarks>
-            /// Retrieve email history.
+            /// Description for Retrieve email history.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -945,7 +949,7 @@ public static IList<CertificateEmail> RetrieveCertificateEmailHistory(this IAppS
             /// Retrieve email history.
             /// </summary>
             /// <remarks>
-            /// Retrieve email history.
+            /// Description for Retrieve email history.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -971,7 +975,7 @@ public static IList<CertificateEmail> RetrieveCertificateEmailHistory(this IAppS
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -994,7 +998,7 @@ public static AppServiceCertificateOrder BeginCreateOrUpdate(this IAppServiceCer
             /// Create or update a certificate purchase order.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate purchase order.
+            /// Description for Create or update a certificate purchase order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1023,7 +1027,8 @@ public static AppServiceCertificateOrder BeginCreateOrUpdate(this IAppServiceCer
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1049,7 +1054,8 @@ public static AppServiceCertificateResource BeginCreateOrUpdateCertificate(this
             /// Creates or updates a certificate and associates with key vault secret.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a certificate and associates with key vault secret.
+            /// Description for Creates or updates a certificate and associates with key
+            /// vault secret.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1081,7 +1087,7 @@ public static AppServiceCertificateResource BeginCreateOrUpdateCertificate(this
             /// List all certificate orders in a subscription.
             /// </summary>
             /// <remarks>
-            /// List all certificate orders in a subscription.
+            /// Description for List all certificate orders in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1098,7 +1104,7 @@ public static IPage<AppServiceCertificateOrder> ListNext(this IAppServiceCertifi
             /// List all certificate orders in a subscription.
             /// </summary>
             /// <remarks>
-            /// List all certificate orders in a subscription.
+            /// Description for List all certificate orders in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1121,7 +1127,7 @@ public static IPage<AppServiceCertificateOrder> ListNext(this IAppServiceCertifi
             /// Get certificate orders in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get certificate orders in a resource group.
+            /// Description for Get certificate orders in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1138,7 +1144,7 @@ public static IPage<AppServiceCertificateOrder> ListByResourceGroupNext(this IAp
             /// Get certificate orders in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get certificate orders in a resource group.
+            /// Description for Get certificate orders in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1161,7 +1167,7 @@ public static IPage<AppServiceCertificateOrder> ListByResourceGroupNext(this IAp
             /// List all certificates associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// List all certificates associated with a certificate order.
+            /// Description for List all certificates associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1178,7 +1184,7 @@ public static IPage<AppServiceCertificateResource> ListCertificatesNext(this IAp
             /// List all certificates associated with a certificate order.
             /// </summary>
             /// <remarks>
-            /// List all certificates associated with a certificate order.
+            /// Description for List all certificates associated with a certificate order.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperations.cs
index 4cb7dbcd57a5..dd3bef96890c 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperations.cs
@@ -54,7 +54,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get all App Service Environments for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments for a subscription.
+        /// Description for Get all App Service Environments for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +83,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +94,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +102,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/hostingEnvironments").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -228,7 +230,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get all App Service Environments in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments in a resource group.
+        /// Description for Get all App Service Environments in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -279,7 +281,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -288,7 +293,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -298,9 +302,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -426,7 +430,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get the properties of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the properties of an App Service Environment.
+        /// Description for Get the properties of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -484,7 +488,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -494,7 +501,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -505,9 +511,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -633,7 +639,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -661,7 +667,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Delete an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Delete an App Service Environment.
+        /// Description for Delete an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -691,7 +697,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -708,7 +714,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -756,7 +762,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -767,7 +776,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostingEnvironmentEnvelope", hostingEnvironmentEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -778,9 +786,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -846,16 +854,15 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -865,10 +872,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient 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);
@@ -907,6 +910,24 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 }
             }
             // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
             if ((int)_statusCode == 202)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
@@ -936,8 +957,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get the used, available, and total worker capacity an App Service
-        /// Environment.
+        /// Description for Get the used, available, and total worker capacity an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -995,7 +1016,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1005,7 +1029,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListCapacities", tracingParameters);
             }
@@ -1016,9 +1039,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1144,7 +1167,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get IP addresses assigned to an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get IP addresses assigned to an App Service Environment.
+        /// Description for Get IP addresses assigned to an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1173,7 +1196,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<AddressResponse>> ListVipsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AddressResponse>> GetVipInfoWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -1202,7 +1225,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1212,9 +1238,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListVips", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetVipInfo", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -1223,9 +1248,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1351,7 +1376,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different VNET.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1379,7 +1404,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get diagnostic information for an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get diagnostic information for an App Service Environment.
+        /// Description for Get diagnostic information for an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1437,7 +1462,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1447,7 +1475,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDiagnostics", tracingParameters);
             }
@@ -1458,9 +1485,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1586,7 +1613,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get a diagnostics item for an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get a diagnostics item for an App Service Environment.
+        /// Description for Get a diagnostics item for an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1651,7 +1678,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1662,7 +1692,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("diagnosticsName", diagnosticsName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDiagnosticsItem", tracingParameters);
             }
@@ -1674,9 +1703,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{diagnosticsName}", System.Uri.EscapeDataString(diagnosticsName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1803,8 +1832,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all inbound dependencies of an App Service
-        /// Environment.
+        /// Description for Get the network endpoints of all inbound dependencies of an
+        /// App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1862,7 +1891,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1872,7 +1904,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInboundNetworkDependenciesEndpoints", tracingParameters);
             }
@@ -1883,9 +1914,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2008,10 +2039,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get global metric definitions of an App Service Environment.
+        /// Get all multi-role pools.
         /// </summary>
         /// <remarks>
-        /// Get global metric definitions of an App Service Environment.
+        /// Description for Get all multi-role pools.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2040,7 +2071,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<MetricDefinition>> ListMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListMultiRolePoolsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2069,7 +2100,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2079,20 +2113,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePools", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2182,7 +2215,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<MetricDefinition>();
+            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2195,7 +2228,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MetricDefinition>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2215,10 +2248,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get global metrics of an App Service Environment.
+        /// Get properties of a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get global metrics of an App Service Environment.
+        /// Description for Get properties of a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2226,16 +2259,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -2257,7 +2280,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> GetMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2286,7 +2309,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2296,30 +2322,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetMultiRolePool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
-            {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2409,7 +2424,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2422,7 +2437,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2442,10 +2457,38 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all multi-role pools.
+        /// Create or update a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get all multi-role pools.
+        /// Description for Create or update a multi-role pool.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service Environment.
+        /// </param>
+        /// <param name='multiRolePoolEnvelope'>
+        /// Properties of the multi-role pool.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<WorkerPoolResource>> CreateOrUpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<WorkerPoolResource> _response = await BeginCreateOrUpdateMultiRolePoolWithHttpMessagesAsync(resourceGroupName, name, multiRolePoolEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Create or update a multi-role pool.
+        /// </summary>
+        /// <remarks>
+        /// Description for Create or update a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2453,6 +2496,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
+        /// <param name='multiRolePoolEnvelope'>
+        /// Properties of the multi-role pool.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -2474,7 +2520,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListMultiRolePoolsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> UpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2499,11 +2545,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (multiRolePoolEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "multiRolePoolEnvelope");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2513,20 +2566,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("multiRolePoolEnvelope", multiRolePoolEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePools", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateMultiRolePool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2535,7 +2588,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -2566,6 +2619,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(multiRolePoolEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(multiRolePoolEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -2586,7 +2645,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -2616,7 +2675,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2629,7 +2688,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2649,10 +2726,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get properties of a multi-role pool.
+        /// Get metric definitions for a specific instance of a multi-role pool of an
+        /// App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get properties of a multi-role pool.
+        /// Description for Get metric definitions for a specific instance of a
+        /// multi-role pool of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2660,6 +2739,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
+        /// <param name='instance'>
+        /// Name of the instance in the multi-role pool.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -2681,7 +2763,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> GetMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2706,11 +2788,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (instance == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2720,20 +2809,21 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("instance", instance);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetMultiRolePool", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetricDefinitions", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metricdefinitions").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2823,7 +2913,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2836,7 +2926,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2856,38 +2946,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Create or update a multi-role pool.
-        /// </summary>
-        /// <remarks>
-        /// Create or update a multi-role pool.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='multiRolePoolEnvelope'>
-        /// Properties of the multi-role pool.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> CreateOrUpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<WorkerPoolResource> _response = await BeginCreateOrUpdateMultiRolePoolWithHttpMessagesAsync(resourceGroupName, name, multiRolePoolEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Create or update a multi-role pool.
+        /// Get metric definitions for a multi-role pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update a multi-role pool.
+        /// Description for Get metric definitions for a multi-role pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2895,16 +2958,13 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='multiRolePoolEnvelope'>
-        /// Properties of the multi-role pool.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -2919,7 +2979,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> UpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2944,15 +3004,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (multiRolePoolEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "multiRolePoolEnvelope");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2962,21 +3021,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("multiRolePoolEnvelope", multiRolePoolEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateMultiRolePool", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetricDefinitions", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metricdefinitions").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2985,7 +3042,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -3016,12 +3073,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(multiRolePoolEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(multiRolePoolEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -3042,16 +3093,15 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -3061,10 +3111,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient 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);
@@ -3077,7 +3123,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3090,25 +3136,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3128,12 +3156,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a specific instance of a multi-role pool of an
-        /// App Service Environment.
+        /// Get available SKUs for scaling a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a multi-role pool of an
-        /// App Service Environment.
+        /// Description for Get available SKUs for scaling a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3141,9 +3167,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the multi-role pool.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -3165,7 +3188,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListMultiRolePoolSkusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3190,15 +3213,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (instance == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3208,22 +3230,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("instance", instance);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolSkus", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/skus").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3313,7 +3332,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3326,7 +3345,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3346,11 +3365,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a specific instance of a multi-role pool of an App Service
-        /// Environment.
+        /// Get usage metrics for a multi-role pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a specific instance of a multi-role pool of an App Service
+        /// Description for Get usage metrics for a multi-role pool of an App Service
         /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -3359,13 +3377,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the multi-role pool.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -3387,7 +3398,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRolePoolInstanceMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string instance, bool? details = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Usage>>> ListMultiRoleUsagesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3412,15 +3423,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (instance == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3430,27 +3440,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("instance", instance);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleUsages", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/instances/{instance}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/usages").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3540,7 +3542,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<Usage>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3553,7 +3555,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3573,10 +3575,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a multi-role pool of an App Service Environment.
+        /// List all currently running operations on the App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a multi-role pool of an App Service Environment.
+        /// Description for List all currently running operations on the App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3605,7 +3608,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<Operation>>> ListOperationsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3634,7 +3637,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3644,20 +3650,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3747,7 +3752,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IList<Operation>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3760,7 +3765,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<Operation>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3780,10 +3785,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a multi-role pool of an App Service Environment.
+        /// Get the network endpoints of all outbound dependencies of an App Service
+        /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a multi-role pool of an App Service Environment.
+        /// Description for Get the network endpoints of all outbound dependencies of
+        /// an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3791,25 +3798,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='startTime'>
-        /// Beginning time of the metrics query.
-        /// </param>
-        /// <param name='endTime'>
-        /// End time of the metrics query.
-        /// </param>
-        /// <param name='timeGrain'>
-        /// Time granularity of the metrics query.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -3831,7 +3819,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRoleMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string startTime = default(string), string endTime = default(string), string timeGrain = default(string), bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>> GetOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3860,7 +3848,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3870,45 +3861,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("startTime", startTime);
-                tracingParameters.Add("endTime", endTime);
-                tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetOutboundNetworkDependenciesEndpoints", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/outboundNetworkDependenciesEndpoints").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (startTime != null)
-            {
-                _queryParameters.Add(string.Format("startTime={0}", System.Uri.EscapeDataString(startTime)));
-            }
-            if (endTime != null)
-            {
-                _queryParameters.Add(string.Format("endTime={0}", System.Uri.EscapeDataString(endTime)));
-            }
-            if (timeGrain != null)
-            {
-                _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
-            }
-            if (details != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3998,7 +3963,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4011,7 +3976,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<OutboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4031,10 +3996,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Reboot all machines in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Description for Reboot all machines in an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4051,9 +4016,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -4063,7 +4025,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListMultiRolePoolSkusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> RebootWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4092,7 +4054,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4102,20 +4067,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolSkus", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Reboot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/skus").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/reboot").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4124,7 +4088,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -4175,7 +4139,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -4205,31 +4169,13 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -4238,10 +4184,35 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get usage metrics for a multi-role pool of an App Service Environment.
+        /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a multi-role pool of an App Service Environment.
+        /// Description for Resume an App Service Environment.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service Environment.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<IPage<Site>>> ResumeWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<IPage<Site>> _response = await BeginResumeWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get all App Service plans in an App Service Environment.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get all App Service plans in an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4270,7 +4241,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Usage>>> ListMultiRoleUsagesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListAppServicePlansWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4299,7 +4270,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4309,20 +4283,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleUsages", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListAppServicePlans", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default/usages").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/serverfarms").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4412,7 +4385,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Usage>>();
+            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4425,7 +4398,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4445,10 +4418,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List all currently running operations on the App Service Environment.
+        /// Get all apps in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// List all currently running operations on the App Service Environment.
+        /// Description for Get all apps in an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4456,6 +4429,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
+        /// <param name='propertiesToInclude'>
+        /// Comma separated list of app properties to include.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -4477,7 +4453,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<Operation>>> ListOperationsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, string propertiesToInclude = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4506,7 +4482,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4516,20 +4495,24 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("propertiesToInclude", propertiesToInclude);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebApps", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/operations").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/sites").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (propertiesToInclude != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("propertiesToInclude={0}", System.Uri.EscapeDataString(propertiesToInclude)));
+            }
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4619,7 +4602,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<Operation>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4632,7 +4615,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<Operation>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4652,12 +4635,35 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get the network endpoints of all outbound dependencies of an App Service
-        /// Environment.
+        /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all outbound dependencies of an App Service
-        /// Environment.
+        /// Description for Suspend an App Service Environment.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service Environment.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<IPage<Site>>> SuspendWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<IPage<Site>> _response = await BeginSuspendWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get global usage metrics of an App Service Environment.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get global usage metrics of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4665,6 +4671,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
+        /// <param name='filter'>
+        /// Return only usages/metrics specified in the filter. Filter conforms to
+        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
+        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
+        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -4686,7 +4698,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>> GetOutboundNetworkDependenciesEndpointsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4715,7 +4727,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4725,20 +4740,24 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("filter", filter);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetOutboundNetworkDependenciesEndpoints", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListUsages", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/outboundNetworkDependenciesEndpoints").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (filter != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("$filter={0}", filter));
+            }
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4828,7 +4847,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>();
+            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4841,7 +4860,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<OutboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4861,10 +4880,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Reboot all machines in an App Service Environment.
+        /// Get all worker pools of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Reboot all machines in an App Service Environment.
+        /// Description for Get all worker pools of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4878,9 +4897,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -4890,7 +4912,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> RebootWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListWorkerPoolsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4919,7 +4941,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4929,20 +4954,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Reboot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPools", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/reboot").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4951,7 +4975,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5002,16 +5026,15 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -5021,10 +5044,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient 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);
@@ -5037,13 +5056,31 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -5052,10 +5089,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Resume an App Service Environment.
+        /// Get properties of a worker pool.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Get properties of a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5063,30 +5100,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<IPage<Site>>> ResumeWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<IPage<Site>> _response = await BeginResumeWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get all App Service plans in an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get all App Service plans in an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5109,7 +5124,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListAppServicePlansWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> GetWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5134,11 +5149,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (workerPoolName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5148,20 +5170,21 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("workerPoolName", workerPoolName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListAppServicePlans", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetWorkerPool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/serverfarms").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5251,7 +5274,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5264,7 +5287,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5284,10 +5307,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all apps in an App Service Environment.
+        /// Create or update a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get all apps in an App Service Environment.
+        /// Description for Create or update a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5295,8 +5318,42 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='propertiesToInclude'>
-        /// Comma separated list of app properties to include.
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
+        /// </param>
+        /// <param name='workerPoolEnvelope'>
+        /// Properties of the worker pool.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<WorkerPoolResource>> CreateOrUpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<WorkerPoolResource> _response = await BeginCreateOrUpdateWorkerPoolWithHttpMessagesAsync(resourceGroupName, name, workerPoolName, workerPoolEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Create or update a worker pool.
+        /// </summary>
+        /// <remarks>
+        /// Description for Create or update a worker pool.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service Environment.
+        /// </param>
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
+        /// </param>
+        /// <param name='workerPoolEnvelope'>
+        /// Properties of the worker pool.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5319,7 +5376,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, string propertiesToInclude = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> UpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5344,11 +5401,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (workerPoolName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+            }
+            if (workerPoolEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolEnvelope");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5358,25 +5426,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("propertiesToInclude", propertiesToInclude);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("workerPoolName", workerPoolName);
+                tracingParameters.Add("workerPoolEnvelope", workerPoolEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebApps", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateWorkerPool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/sites").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (propertiesToInclude != null)
-            {
-                _queryParameters.Add(string.Format("propertiesToInclude={0}", System.Uri.EscapeDataString(propertiesToInclude)));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5385,7 +5450,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5416,6 +5481,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(workerPoolEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(workerPoolEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -5436,7 +5507,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -5466,7 +5537,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5479,7 +5550,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5499,10 +5588,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Suspend an App Service Environment.
+        /// Get metric definitions for a specific instance of a worker pool of an App
+        /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a worker
+        /// pool of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5510,36 +5601,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<IPage<Site>>> SuspendWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<IPage<Site>> _response = await BeginSuspendWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get global usage metrics of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get global usage metrics of an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
         /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// <param name='instance'>
+        /// Name of the instance in the worker pool.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -5562,7 +5628,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5587,11 +5653,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (workerPoolName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+            }
+            if (instance == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5601,25 +5678,23 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("workerPoolName", workerPoolName);
+                tracingParameters.Add("instance", instance);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListUsages", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetricDefinitions", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/usages").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metricdefinitions").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
+            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5709,7 +5784,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5722,7 +5797,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5742,10 +5817,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all worker pools of an App Service Environment.
+        /// Get metric definitions for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all worker pools of an App Service Environment.
+        /// Description for Get metric definitions for a worker pool of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5753,6 +5829,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5774,7 +5853,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListWorkerPoolsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5799,11 +5878,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (workerPoolName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5813,20 +5899,21 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("workerPoolName", workerPoolName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPools", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetricDefinitions", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metricdefinitions").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5916,7 +6003,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5929,7 +6016,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5949,10 +6036,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get properties of a worker pool.
+        /// Get available SKUs for scaling a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get properties of a worker pool.
+        /// Description for Get available SKUs for scaling a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5984,7 +6071,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> GetWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListWorkerPoolSkusWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6017,7 +6104,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6028,21 +6118,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetWorkerPool", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolSkus", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/skus").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6132,7 +6221,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
+            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6145,7 +6234,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6165,41 +6254,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Create or update a worker pool.
-        /// </summary>
-        /// <remarks>
-        /// Create or update a worker pool.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
-        /// <param name='workerPoolEnvelope'>
-        /// Properties of the worker pool.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> CreateOrUpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<WorkerPoolResource> _response = await BeginCreateOrUpdateWorkerPoolWithHttpMessagesAsync(resourceGroupName, name, workerPoolName, workerPoolEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Create or update a worker pool.
+        /// Get usage metrics for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update a worker pool.
+        /// Description for Get usage metrics for a worker pool of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6210,16 +6269,13 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='workerPoolName'>
         /// Name of the worker pool.
         /// </param>
-        /// <param name='workerPoolEnvelope'>
-        /// Properties of the worker pool.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -6234,7 +6290,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> UpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Usage>>> ListWebWorkerUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6263,15 +6319,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
             }
-            if (workerPoolEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolEnvelope");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6282,22 +6337,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("workerPoolEnvelope", workerPoolEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateWorkerPool", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerUsages", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/usages").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6306,7 +6359,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6337,12 +6390,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(workerPoolEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(workerPoolEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6363,16 +6410,15 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -6382,10 +6428,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient 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);
@@ -6398,7 +6440,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
+            var _result = new AzureOperationResponse<IPage<Usage>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6411,25 +6453,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6449,12 +6473,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a specific instance of a worker pool of an App
-        /// Service Environment.
+        /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a worker pool of an App
-        /// Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6462,11 +6484,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the worker pool.
+        /// <param name='hostingEnvironmentEnvelope'>
+        /// Configuration details of the App Service Environment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6489,7 +6508,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AppServiceEnvironmentResource>> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, AppServiceEnvironmentResource hostingEnvironmentEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6514,19 +6533,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
+            if (hostingEnvironmentEnvelope == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "hostingEnvironmentEnvelope");
             }
-            if (instance == null)
+            if (hostingEnvironmentEnvelope != null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
+                hostingEnvironmentEnvelope.Validate();
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6536,24 +6558,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("instance", instance);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("hostingEnvironmentEnvelope", hostingEnvironmentEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
-            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6562,7 +6580,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6593,6 +6611,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(hostingEnvironmentEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(hostingEnvironmentEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6613,7 +6637,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -6643,7 +6667,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<AppServiceEnvironmentResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6656,7 +6680,43 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6676,12 +6736,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a specific instance of a worker pool of an App Service
-        /// Environment.
+        /// Delete an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a specific instance of a worker pool of an App Service
-        /// Environment.
+        /// Description for Delete an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6689,21 +6747,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the worker pool.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// <param name='forceDelete'>
+        /// Specify &lt;code&gt;true&lt;/code&gt; to force the deletion even if the App
+        /// Service Environment contains resources. The default is
+        /// &lt;code&gt;false&lt;/code&gt;.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6714,9 +6761,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -6726,7 +6770,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWorkerPoolInstanceMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, string instance, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string name, bool? forceDelete = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6751,19 +6795,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
-            }
-            if (instance == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instance");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6773,43 +6812,33 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("instance", instance);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("forceDelete", forceDelete);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/instances/{instance}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
-            _url = _url.Replace("{instance}", System.Uri.EscapeDataString(instance));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
+            if (forceDelete != null)
             {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("forceDelete={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(forceDelete, Client.SerializationSettings).Trim('"'))));
             }
-            if (filter != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
+            if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
             }
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6860,7 +6889,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 202 && (int)_statusCode != 204)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -6890,31 +6919,13 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -6923,10 +6934,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a worker pool of an App Service Environment.
+        /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a worker pool of an App Service Environment.
+        /// Description for Move an App Service Environment to a different VNET.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6934,8 +6945,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
+        /// <param name='vnetInfo'>
+        /// Details for the new virtual network.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6958,7 +6969,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> BeginChangeVnetWithHttpMessagesAsync(string resourceGroupName, string name, VirtualNetworkProfile vnetInfo, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6983,15 +6994,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
+            if (vnetInfo == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "vnetInfo");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7001,22 +7015,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("vnetInfo", vnetInfo);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginChangeVnet", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/changeVirtualNetwork").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7025,7 +7037,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7056,6 +7068,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(vnetInfo != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(vnetInfo, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -7076,7 +7094,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -7106,7 +7124,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7119,7 +7137,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7139,12 +7175,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-        /// Environment).
+        /// Create or update a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-        /// Environment).
+        /// Description for Create or update a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7152,18 +7186,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of worker pool
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// <param name='multiRolePoolEnvelope'>
+        /// Properties of the multi-role pool.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7186,7 +7210,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWebWorkerMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> BeginCreateOrUpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7211,15 +7235,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
+            if (multiRolePoolEnvelope == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "multiRolePoolEnvelope");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7229,32 +7256,20 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("multiRolePoolEnvelope", multiRolePoolEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateMultiRolePool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
-            {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7263,7 +7278,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7294,6 +7309,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(multiRolePoolEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(multiRolePoolEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -7314,7 +7335,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -7344,7 +7365,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7357,7 +7378,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7377,10 +7416,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get available SKUs for scaling a worker pool.
+        /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a worker pool.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7388,9 +7427,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -7412,7 +7448,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListWorkerPoolSkusWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> BeginResumeWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7437,15 +7473,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7455,22 +7490,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolSkus", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginResume", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/skus").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/resume").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7479,7 +7511,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7530,7 +7562,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -7560,7 +7592,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7573,7 +7605,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7593,10 +7643,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get usage metrics for a worker pool of an App Service Environment.
+        /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a worker pool of an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7604,9 +7654,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -7628,7 +7675,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Usage>>> ListWebWorkerUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> BeginSuspendWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7653,15 +7700,14 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (workerPoolName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7671,22 +7717,19 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerUsages", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginSuspend", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}/usages").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7695,7 +7738,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7746,7 +7789,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -7776,7 +7819,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Usage>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7789,7 +7832,25 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7809,10 +7870,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Create or update an App Service Environment.
+        /// Create or update a worker pool.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7820,8 +7881,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service Environment.
         /// </param>
-        /// <param name='hostingEnvironmentEnvelope'>
-        /// Configuration details of the App Service Environment.
+        /// <param name='workerPoolName'>
+        /// Name of the worker pool.
+        /// </param>
+        /// <param name='workerPoolEnvelope'>
+        /// Properties of the worker pool.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7829,7 +7893,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -7844,7 +7908,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<AppServiceEnvironmentResource>> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, AppServiceEnvironmentResource hostingEnvironmentEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WorkerPoolResource>> BeginCreateOrUpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7869,19 +7933,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (hostingEnvironmentEnvelope == null)
+            if (workerPoolName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "hostingEnvironmentEnvelope");
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
             }
-            if (hostingEnvironmentEnvelope != null)
+            if (workerPoolEnvelope == null)
             {
-                hostingEnvironmentEnvelope.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolEnvelope");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7891,21 +7958,22 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("hostingEnvironmentEnvelope", hostingEnvironmentEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("workerPoolName", workerPoolName);
+                tracingParameters.Add("workerPoolEnvelope", workerPoolEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateWorkerPool", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7945,9 +8013,9 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(hostingEnvironmentEnvelope != null)
+            if(workerPoolEnvelope != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(hostingEnvironmentEnvelope, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(workerPoolEnvelope, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -7971,16 +8039,15 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -7990,10 +8057,6 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient 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);
@@ -8006,7 +8069,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<AppServiceEnvironmentResource>();
+            var _result = new AzureOperationResponse<WorkerPoolResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -8019,25 +8082,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServiceEnvironmentResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -8045,2267 +8090,17 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                     if (_httpResponse != null)
                     {
                         _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Delete an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Delete an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='forceDelete'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to force the deletion even if the App
-        /// Service Environment contains resources. The default is
-        /// &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> BeginDeleteWithHttpMessagesAsync(string resourceGroupName, string name, bool? forceDelete = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("forceDelete", forceDelete);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginDelete", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (forceDelete != null)
-            {
-                _queryParameters.Add(string.Format("forceDelete={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(forceDelete, Client.SerializationSettings).Trim('"'))));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 202 && (int)_statusCode != 204 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Move an App Service Environment to a different VNET.
-        /// </summary>
-        /// <remarks>
-        /// Move an App Service Environment to a different VNET.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='vnetInfo'>
-        /// Details for the new virtual network.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> BeginChangeVnetWithHttpMessagesAsync(string resourceGroupName, string name, VirtualNetworkProfile vnetInfo, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (vnetInfo == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vnetInfo");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("vnetInfo", vnetInfo);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginChangeVnet", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/changeVirtualNetwork").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(vnetInfo != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(vnetInfo, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Create or update a multi-role pool.
-        /// </summary>
-        /// <remarks>
-        /// Create or update a multi-role pool.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='multiRolePoolEnvelope'>
-        /// Properties of the multi-role pool.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> BeginCreateOrUpdateMultiRolePoolWithHttpMessagesAsync(string resourceGroupName, string name, WorkerPoolResource multiRolePoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (multiRolePoolEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "multiRolePoolEnvelope");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("multiRolePoolEnvelope", multiRolePoolEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateMultiRolePool", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/multiRolePools/default").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(multiRolePoolEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(multiRolePoolEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Resume an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Resume an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> BeginResumeWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginResume", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/resume").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Suspend an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Suspend an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> BeginSuspendWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginSuspend", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/suspend").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Create or update a worker pool.
-        /// </summary>
-        /// <remarks>
-        /// Create or update a worker pool.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
-        /// <param name='workerPoolEnvelope'>
-        /// Properties of the worker pool.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<WorkerPoolResource>> BeginCreateOrUpdateWorkerPoolWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, WorkerPoolResource workerPoolEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (workerPoolName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolName");
-            }
-            if (workerPoolEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerPoolEnvelope");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("workerPoolName", workerPoolName);
-                tracingParameters.Add("workerPoolEnvelope", workerPoolEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateWorkerPool", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/hostingEnvironments/{name}/workerPools/{workerPoolName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerPoolName}", System.Uri.EscapeDataString(workerPoolName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(workerPoolEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(workerPoolEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 400 && (int)_statusCode != 404 && (int)_statusCode != 409)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<WorkerPoolResource>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get all App Service Environments for a subscription.
-        /// </summary>
-        /// <remarks>
-        /// Get all App Service Environments for a subscription.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServiceEnvironmentResource>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServiceEnvironmentResource>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServiceEnvironmentResource>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get all App Service Environments in a resource group.
-        /// </summary>
-        /// <remarks>
-        /// Get all App Service Environments in a resource group.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServiceEnvironmentResource>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServiceEnvironmentResource>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServiceEnvironmentResource>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get the used, available, and total worker capacity an App Service
-        /// Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get the used, available, and total worker capacity an App Service
-        /// Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<StampCapacity>>> ListCapacitiesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListCapacitiesNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<StampCapacity>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<StampCapacity>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Move an App Service Environment to a different VNET.
-        /// </summary>
-        /// <remarks>
-        /// Move an App Service Environment to a different VNET.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<IPage<Site>>> ChangeVnetNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<IPage<Site>> _response = await BeginChangeVnetNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get the network endpoints of all inbound dependencies of an App Service
-        /// Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get the network endpoints of all inbound dependencies of an App Service
-        /// Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>> GetInboundNetworkDependenciesEndpointsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInboundNetworkDependenciesEndpointsNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<InboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get global metrics of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get global metrics of an App Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricsNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 200)
+            if ((int)_statusCode == 202)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WorkerPoolResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -10325,10 +8120,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all multi-role pools.
+        /// Get all App Service Environments for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all multi-role pools.
+        /// Description for Get all App Service Environments for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -10354,7 +8149,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListMultiRolePoolsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServiceEnvironmentResource>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -10369,7 +8164,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -10463,7 +8258,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
+            var _result = new AzureOperationResponse<IPage<AppServiceEnvironmentResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -10476,7 +8271,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServiceEnvironmentResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -10496,12 +8291,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a specific instance of a multi-role pool of an
-        /// App Service Environment.
+        /// Get all App Service Environments in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a multi-role pool of an
-        /// App Service Environment.
+        /// Description for Get all App Service Environments in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -10527,7 +8320,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServiceEnvironmentResource>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -10542,7 +8335,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetricDefinitionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -10636,7 +8429,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<AppServiceEnvironmentResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -10649,7 +8442,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServiceEnvironmentResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -10669,12 +8462,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a specific instance of a multi-role pool of an App Service
+        /// Get the used, available, and total worker capacity an App Service
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a specific instance of a multi-role pool of an App Service
-        /// Environment.
+        /// Description for Get the used, available, and total worker capacity an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -10700,7 +8493,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRolePoolInstanceMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<StampCapacity>>> ListCapacitiesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -10715,7 +8508,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListCapacitiesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -10809,7 +8602,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<StampCapacity>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -10822,7 +8615,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<StampCapacity>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -10842,10 +8635,34 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a multi-role pool of an App Service Environment.
+        /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a multi-role pool of an App Service Environment.
+        /// Description for Move an App Service Environment to a different VNET.
+        /// </remarks>
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<IPage<Site>>> ChangeVnetNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<IPage<Site>> _response = await BeginChangeVnetNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get the network endpoints of all inbound dependencies of an App Service
+        /// Environment.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get the network endpoints of all inbound dependencies of an
+        /// App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -10871,7 +8688,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>> GetInboundNetworkDependenciesEndpointsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -10886,7 +8703,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetricDefinitionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInboundNetworkDependenciesEndpointsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -10980,7 +8797,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -10993,7 +8810,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<InboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11013,10 +8830,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a multi-role pool of an App Service Environment.
+        /// Get all multi-role pools.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a multi-role pool of an App Service Environment.
+        /// Description for Get all multi-role pools.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11042,7 +8859,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRoleMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListMultiRolePoolsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11057,7 +8874,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -11151,7 +8968,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -11164,7 +8981,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11184,10 +9001,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Get metric definitions for a specific instance of a multi-role pool of an
+        /// App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Description for Get metric definitions for a specific instance of a
+        /// multi-role pool of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11213,7 +9032,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListMultiRolePoolSkusNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11228,7 +9047,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolSkusNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolInstanceMetricDefinitionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -11322,7 +9141,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -11335,7 +9154,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11355,10 +9174,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get usage metrics for a multi-role pool of an App Service Environment.
+        /// Get metric definitions for a multi-role pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a multi-role pool of an App Service Environment.
+        /// Description for Get metric definitions for a multi-role pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11384,7 +9204,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Usage>>> ListMultiRoleUsagesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11399,7 +9219,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleUsagesNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleMetricDefinitionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -11493,7 +9313,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Usage>>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -11506,7 +9326,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11526,12 +9346,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get the network endpoints of all outbound dependencies of an App Service
-        /// Environment.
+        /// Get available SKUs for scaling a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all outbound dependencies of an App Service
-        /// Environment.
+        /// Description for Get available SKUs for scaling a multi-role pool.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11557,7 +9375,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>> GetOutboundNetworkDependenciesEndpointsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SkuInfo>>> ListMultiRolePoolSkusNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11572,7 +9390,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetOutboundNetworkDependenciesEndpointsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRolePoolSkusNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -11666,7 +9484,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>();
+            var _result = new AzureOperationResponse<IPage<SkuInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -11679,7 +9497,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<OutboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SkuInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11699,32 +9517,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Resume an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Resume an App Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<IPage<Site>>> ResumeNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<IPage<Site>> _response = await BeginResumeNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get all App Service plans in an App Service Environment.
+        /// Get usage metrics for a multi-role pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in an App Service Environment.
+        /// Description for Get usage metrics for a multi-role pool of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11750,7 +9547,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListAppServicePlansNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Usage>>> ListMultiRoleUsagesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11765,7 +9562,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListAppServicePlansNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMultiRoleUsagesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -11859,7 +9656,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
+            var _result = new AzureOperationResponse<IPage<Usage>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -11872,7 +9669,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Usage>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -11892,10 +9689,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all apps in an App Service Environment.
+        /// Get the network endpoints of all outbound dependencies of an App Service
+        /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get all apps in an App Service Environment.
+        /// Description for Get the network endpoints of all outbound dependencies of
+        /// an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -11921,7 +9720,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>> GetOutboundNetworkDependenciesEndpointsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -11936,7 +9735,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebAppsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetOutboundNetworkDependenciesEndpointsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12030,7 +9829,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
+            var _result = new AzureOperationResponse<IPage<OutboundEnvironmentEndpoint>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -12043,7 +9842,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<OutboundEnvironmentEndpoint>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -12063,10 +9862,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Suspend an App Service Environment.
+        /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12077,18 +9876,18 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<IPage<Site>>> SuspendNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ResumeNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send request
-            AzureOperationResponse<IPage<Site>> _response = await BeginSuspendNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<IPage<Site>> _response = await BeginResumeNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Get global usage metrics of an App Service Environment.
+        /// Get all App Service plans in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get global usage metrics of an App Service Environment.
+        /// Description for Get all App Service plans in an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12114,7 +9913,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListAppServicePlansNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12129,7 +9928,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListUsagesNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListAppServicePlansNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12223,7 +10022,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
+            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -12236,7 +10035,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -12256,10 +10055,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all worker pools of an App Service Environment.
+        /// Get all apps in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all worker pools of an App Service Environment.
+        /// Description for Get all apps in an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12285,7 +10084,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListWorkerPoolsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12300,7 +10099,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebAppsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12394,7 +10193,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -12407,7 +10206,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -12427,12 +10226,32 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a specific instance of a worker pool of an App
-        /// Service Environment.
+        /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a worker pool of an App
-        /// Service Environment.
+        /// Description for Suspend an App Service Environment.
+        /// </remarks>
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<IPage<Site>>> SuspendNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<IPage<Site>> _response = await BeginSuspendNextWithHttpMessagesAsync(nextPageLink, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get global usage metrics of an App Service Environment.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get global usage metrics of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12458,7 +10277,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12473,7 +10292,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetricDefinitionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListUsagesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12567,7 +10386,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -12580,7 +10399,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -12600,12 +10419,10 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a specific instance of a worker pool of an App Service
-        /// Environment.
+        /// Get all worker pools of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a specific instance of a worker pool of an App Service
-        /// Environment.
+        /// Description for Get all worker pools of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12631,7 +10448,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWorkerPoolInstanceMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<WorkerPoolResource>>> ListWorkerPoolsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12646,7 +10463,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12740,7 +10557,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<WorkerPoolResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -12753,7 +10570,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<WorkerPoolResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -12773,10 +10590,12 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metric definitions for a worker pool of an App Service Environment.
+        /// Get metric definitions for a specific instance of a worker pool of an App
+        /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a worker pool of an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a worker
+        /// pool of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12802,7 +10621,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12817,7 +10636,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetricDefinitionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWorkerPoolInstanceMetricDefinitionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -12944,12 +10763,11 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-        /// Environment).
+        /// Get metric definitions for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-        /// Environment).
+        /// Description for Get metric definitions for a worker pool of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12975,7 +10793,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWebWorkerMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -12990,7 +10808,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebWorkerMetricDefinitionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -13084,7 +10902,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -13097,7 +10915,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -13120,7 +10938,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get available SKUs for scaling a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a worker pool.
+        /// Description for Get available SKUs for scaling a worker pool.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13291,7 +11109,8 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Get usage metrics for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a worker pool of an App Service Environment.
+        /// Description for Get usage metrics for a worker pool of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13462,7 +11281,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different VNET.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13651,7 +11470,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13840,7 +11659,7 @@ internal AppServiceEnvironmentsOperations(WebSiteManagementClient client)
         /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperationsExtensions.cs
index f2976f0aaf03..e4a6d169b17e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServiceEnvironmentsOperationsExtensions.cs
@@ -27,7 +27,7 @@ public static partial class AppServiceEnvironmentsOperationsExtensions
             /// Get all App Service Environments for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments for a subscription.
+            /// Description for Get all App Service Environments for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -41,7 +41,7 @@ public static IPage<AppServiceEnvironmentResource> List(this IAppServiceEnvironm
             /// Get all App Service Environments for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments for a subscription.
+            /// Description for Get all App Service Environments for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -61,7 +61,7 @@ public static IPage<AppServiceEnvironmentResource> List(this IAppServiceEnvironm
             /// Get all App Service Environments in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments in a resource group.
+            /// Description for Get all App Service Environments in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -78,7 +78,7 @@ public static IPage<AppServiceEnvironmentResource> ListByResourceGroup(this IApp
             /// Get all App Service Environments in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments in a resource group.
+            /// Description for Get all App Service Environments in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -101,7 +101,7 @@ public static IPage<AppServiceEnvironmentResource> ListByResourceGroup(this IApp
             /// Get the properties of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get the properties of an App Service Environment.
+            /// Description for Get the properties of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -121,7 +121,7 @@ public static AppServiceEnvironmentResource Get(this IAppServiceEnvironmentsOper
             /// Get the properties of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get the properties of an App Service Environment.
+            /// Description for Get the properties of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -147,7 +147,7 @@ public static AppServiceEnvironmentResource Get(this IAppServiceEnvironmentsOper
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -170,7 +170,7 @@ public static AppServiceEnvironmentResource CreateOrUpdate(this IAppServiceEnvir
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -199,7 +199,7 @@ public static AppServiceEnvironmentResource CreateOrUpdate(this IAppServiceEnvir
             /// Delete an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service Environment.
+            /// Description for Delete an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -224,7 +224,7 @@ public static AppServiceEnvironmentResource CreateOrUpdate(this IAppServiceEnvir
             /// Delete an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service Environment.
+            /// Description for Delete an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -252,7 +252,7 @@ public static AppServiceEnvironmentResource CreateOrUpdate(this IAppServiceEnvir
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -275,7 +275,7 @@ public static AppServiceEnvironmentResource Update(this IAppServiceEnvironmentsO
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -305,8 +305,8 @@ public static AppServiceEnvironmentResource Update(this IAppServiceEnvironmentsO
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the used, available, and total worker capacity an App Service
-            /// Environment.
+            /// Description for Get the used, available, and total worker capacity an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -327,8 +327,8 @@ public static IPage<StampCapacity> ListCapacities(this IAppServiceEnvironmentsOp
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the used, available, and total worker capacity an App Service
-            /// Environment.
+            /// Description for Get the used, available, and total worker capacity an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -354,7 +354,7 @@ public static IPage<StampCapacity> ListCapacities(this IAppServiceEnvironmentsOp
             /// Get IP addresses assigned to an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get IP addresses assigned to an App Service Environment.
+            /// Description for Get IP addresses assigned to an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -365,16 +365,16 @@ public static IPage<StampCapacity> ListCapacities(this IAppServiceEnvironmentsOp
             /// <param name='name'>
             /// Name of the App Service Environment.
             /// </param>
-            public static AddressResponse ListVips(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name)
+            public static AddressResponse GetVipInfo(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name)
             {
-                return operations.ListVipsAsync(resourceGroupName, name).GetAwaiter().GetResult();
+                return operations.GetVipInfoAsync(resourceGroupName, name).GetAwaiter().GetResult();
             }
 
             /// <summary>
             /// Get IP addresses assigned to an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get IP addresses assigned to an App Service Environment.
+            /// Description for Get IP addresses assigned to an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -388,9 +388,9 @@ public static AddressResponse ListVips(this IAppServiceEnvironmentsOperations op
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<AddressResponse> ListVipsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<AddressResponse> GetVipInfoAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListVipsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetVipInfoWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -400,7 +400,7 @@ public static AddressResponse ListVips(this IAppServiceEnvironmentsOperations op
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -423,7 +423,7 @@ public static IPage<Site> ChangeVnet(this IAppServiceEnvironmentsOperations oper
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -452,7 +452,7 @@ public static IPage<Site> ChangeVnet(this IAppServiceEnvironmentsOperations oper
             /// Get diagnostic information for an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get diagnostic information for an App Service Environment.
+            /// Description for Get diagnostic information for an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -472,7 +472,7 @@ public static IList<HostingEnvironmentDiagnostics> ListDiagnostics(this IAppServ
             /// Get diagnostic information for an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get diagnostic information for an App Service Environment.
+            /// Description for Get diagnostic information for an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -498,7 +498,7 @@ public static IList<HostingEnvironmentDiagnostics> ListDiagnostics(this IAppServ
             /// Get a diagnostics item for an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get a diagnostics item for an App Service Environment.
+            /// Description for Get a diagnostics item for an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -521,7 +521,7 @@ public static HostingEnvironmentDiagnostics GetDiagnosticsItem(this IAppServiceE
             /// Get a diagnostics item for an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get a diagnostics item for an App Service Environment.
+            /// Description for Get a diagnostics item for an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -551,8 +551,8 @@ public static HostingEnvironmentDiagnostics GetDiagnosticsItem(this IAppServiceE
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all inbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all inbound dependencies of an
+            /// App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -573,8 +573,8 @@ public static IPage<InboundEnvironmentEndpoint> GetInboundNetworkDependenciesEnd
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all inbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all inbound dependencies of an
+            /// App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -596,123 +596,11 @@ public static IPage<InboundEnvironmentEndpoint> GetInboundNetworkDependenciesEnd
                 }
             }
 
-            /// <summary>
-            /// Get global metric definitions of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metric definitions of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            public static MetricDefinition ListMetricDefinitions(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name)
-            {
-                return operations.ListMetricDefinitionsAsync(resourceGroupName, name).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get global metric definitions of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metric definitions of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<MetricDefinition> ListMetricDefinitionsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricDefinitionsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Get global metrics of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metrics of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListMetrics(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListMetricsAsync(resourceGroupName, name, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get global metrics of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metrics of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricsWithHttpMessagesAsync(resourceGroupName, name, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get all multi-role pools.
             /// </summary>
             /// <remarks>
-            /// Get all multi-role pools.
+            /// Description for Get all multi-role pools.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -732,7 +620,7 @@ public static IPage<WorkerPoolResource> ListMultiRolePools(this IAppServiceEnvir
             /// Get all multi-role pools.
             /// </summary>
             /// <remarks>
-            /// Get all multi-role pools.
+            /// Description for Get all multi-role pools.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -758,7 +646,7 @@ public static IPage<WorkerPoolResource> ListMultiRolePools(this IAppServiceEnvir
             /// Get properties of a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get properties of a multi-role pool.
+            /// Description for Get properties of a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -778,7 +666,7 @@ public static WorkerPoolResource GetMultiRolePool(this IAppServiceEnvironmentsOp
             /// Get properties of a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get properties of a multi-role pool.
+            /// Description for Get properties of a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -804,7 +692,7 @@ public static WorkerPoolResource GetMultiRolePool(this IAppServiceEnvironmentsOp
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -827,7 +715,7 @@ public static WorkerPoolResource CreateOrUpdateMultiRolePool(this IAppServiceEnv
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -856,7 +744,7 @@ public static WorkerPoolResource CreateOrUpdateMultiRolePool(this IAppServiceEnv
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -879,7 +767,7 @@ public static WorkerPoolResource UpdateMultiRolePool(this IAppServiceEnvironment
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -909,8 +797,8 @@ public static WorkerPoolResource UpdateMultiRolePool(this IAppServiceEnvironment
             /// App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a multi-role pool of an
-            /// App Service Environment.
+            /// Description for Get metric definitions for a specific instance of a
+            /// multi-role pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -934,8 +822,8 @@ public static IPage<ResourceMetricDefinition> ListMultiRolePoolInstanceMetricDef
             /// App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a multi-role pool of an
-            /// App Service Environment.
+            /// Description for Get metric definitions for a specific instance of a
+            /// multi-role pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -960,75 +848,12 @@ public static IPage<ResourceMetricDefinition> ListMultiRolePoolInstanceMetricDef
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='instance'>
-            /// Name of the instance in the multi-role pool.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            public static IPage<ResourceMetric> ListMultiRolePoolInstanceMetrics(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string instance, bool? details = default(bool?))
-            {
-                return operations.ListMultiRolePoolInstanceMetricsAsync(resourceGroupName, name, instance, details).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='instance'>
-            /// Name of the instance in the multi-role pool.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMultiRolePoolInstanceMetricsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string instance, bool? details = default(bool?), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMultiRolePoolInstanceMetricsWithHttpMessagesAsync(resourceGroupName, name, instance, details, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get metric definitions for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a multi-role pool of an App Service Environment.
+            /// Description for Get metric definitions for a multi-role pool of an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1048,7 +873,8 @@ public static IPage<ResourceMetricDefinition> ListMultiRoleMetricDefinitions(thi
             /// Get metric definitions for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a multi-role pool of an App Service Environment.
+            /// Description for Get metric definitions for a multi-role pool of an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1070,95 +896,11 @@ public static IPage<ResourceMetricDefinition> ListMultiRoleMetricDefinitions(thi
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='startTime'>
-            /// Beginning time of the metrics query.
-            /// </param>
-            /// <param name='endTime'>
-            /// End time of the metrics query.
-            /// </param>
-            /// <param name='timeGrain'>
-            /// Time granularity of the metrics query.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListMultiRoleMetrics(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string startTime = default(string), string endTime = default(string), string timeGrain = default(string), bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListMultiRoleMetricsAsync(resourceGroupName, name, startTime, endTime, timeGrain, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='startTime'>
-            /// Beginning time of the metrics query.
-            /// </param>
-            /// <param name='endTime'>
-            /// End time of the metrics query.
-            /// </param>
-            /// <param name='timeGrain'>
-            /// Time granularity of the metrics query.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMultiRoleMetricsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string startTime = default(string), string endTime = default(string), string timeGrain = default(string), bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMultiRoleMetricsWithHttpMessagesAsync(resourceGroupName, name, startTime, endTime, timeGrain, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get available SKUs for scaling a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a multi-role pool.
+            /// Description for Get available SKUs for scaling a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1178,7 +920,7 @@ public static IPage<SkuInfo> ListMultiRolePoolSkus(this IAppServiceEnvironmentsO
             /// Get available SKUs for scaling a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a multi-role pool.
+            /// Description for Get available SKUs for scaling a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1204,7 +946,8 @@ public static IPage<SkuInfo> ListMultiRolePoolSkus(this IAppServiceEnvironmentsO
             /// Get usage metrics for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a multi-role pool of an App Service Environment.
+            /// Description for Get usage metrics for a multi-role pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1224,7 +967,8 @@ public static IPage<Usage> ListMultiRoleUsages(this IAppServiceEnvironmentsOpera
             /// Get usage metrics for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a multi-role pool of an App Service Environment.
+            /// Description for Get usage metrics for a multi-role pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1250,7 +994,8 @@ public static IPage<Usage> ListMultiRoleUsages(this IAppServiceEnvironmentsOpera
             /// List all currently running operations on the App Service Environment.
             /// </summary>
             /// <remarks>
-            /// List all currently running operations on the App Service Environment.
+            /// Description for List all currently running operations on the App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1270,7 +1015,8 @@ public static IList<Operation> ListOperations(this IAppServiceEnvironmentsOperat
             /// List all currently running operations on the App Service Environment.
             /// </summary>
             /// <remarks>
-            /// List all currently running operations on the App Service Environment.
+            /// Description for List all currently running operations on the App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1297,8 +1043,8 @@ public static IList<Operation> ListOperations(this IAppServiceEnvironmentsOperat
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all outbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all outbound dependencies of
+            /// an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1319,8 +1065,8 @@ public static IPage<OutboundEnvironmentEndpoint> GetOutboundNetworkDependenciesE
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all outbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all outbound dependencies of
+            /// an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1346,7 +1092,7 @@ public static IPage<OutboundEnvironmentEndpoint> GetOutboundNetworkDependenciesE
             /// Reboot all machines in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Reboot all machines in an App Service Environment.
+            /// Description for Reboot all machines in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1366,7 +1112,7 @@ public static void Reboot(this IAppServiceEnvironmentsOperations operations, str
             /// Reboot all machines in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Reboot all machines in an App Service Environment.
+            /// Description for Reboot all machines in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1389,7 +1135,7 @@ public static void Reboot(this IAppServiceEnvironmentsOperations operations, str
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1409,7 +1155,7 @@ public static IPage<Site> Resume(this IAppServiceEnvironmentsOperations operatio
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1435,7 +1181,7 @@ public static IPage<Site> Resume(this IAppServiceEnvironmentsOperations operatio
             /// Get all App Service plans in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in an App Service Environment.
+            /// Description for Get all App Service plans in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1455,7 +1201,7 @@ public static IPage<AppServicePlan> ListAppServicePlans(this IAppServiceEnvironm
             /// Get all App Service plans in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in an App Service Environment.
+            /// Description for Get all App Service plans in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1481,7 +1227,7 @@ public static IPage<AppServicePlan> ListAppServicePlans(this IAppServiceEnvironm
             /// Get all apps in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all apps in an App Service Environment.
+            /// Description for Get all apps in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1504,7 +1250,7 @@ public static IPage<AppServicePlan> ListAppServicePlans(this IAppServiceEnvironm
             /// Get all apps in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all apps in an App Service Environment.
+            /// Description for Get all apps in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1533,7 +1279,7 @@ public static IPage<AppServicePlan> ListAppServicePlans(this IAppServiceEnvironm
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1553,7 +1299,7 @@ public static IPage<Site> Suspend(this IAppServiceEnvironmentsOperations operati
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1579,7 +1325,7 @@ public static IPage<Site> Suspend(this IAppServiceEnvironmentsOperations operati
             /// Get global usage metrics of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get global usage metrics of an App Service Environment.
+            /// Description for Get global usage metrics of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1605,7 +1351,7 @@ public static IPage<Site> Suspend(this IAppServiceEnvironmentsOperations operati
             /// Get global usage metrics of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get global usage metrics of an App Service Environment.
+            /// Description for Get global usage metrics of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1637,7 +1383,7 @@ public static IPage<Site> Suspend(this IAppServiceEnvironmentsOperations operati
             /// Get all worker pools of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all worker pools of an App Service Environment.
+            /// Description for Get all worker pools of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1657,7 +1403,7 @@ public static IPage<WorkerPoolResource> ListWorkerPools(this IAppServiceEnvironm
             /// Get all worker pools of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all worker pools of an App Service Environment.
+            /// Description for Get all worker pools of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1683,7 +1429,7 @@ public static IPage<WorkerPoolResource> ListWorkerPools(this IAppServiceEnvironm
             /// Get properties of a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get properties of a worker pool.
+            /// Description for Get properties of a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1706,7 +1452,7 @@ public static WorkerPoolResource GetWorkerPool(this IAppServiceEnvironmentsOpera
             /// Get properties of a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get properties of a worker pool.
+            /// Description for Get properties of a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1735,7 +1481,7 @@ public static WorkerPoolResource GetWorkerPool(this IAppServiceEnvironmentsOpera
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1761,7 +1507,7 @@ public static WorkerPoolResource CreateOrUpdateWorkerPool(this IAppServiceEnviro
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1793,7 +1539,7 @@ public static WorkerPoolResource CreateOrUpdateWorkerPool(this IAppServiceEnviro
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1819,7 +1565,7 @@ public static WorkerPoolResource UpdateWorkerPool(this IAppServiceEnvironmentsOp
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1852,8 +1598,8 @@ public static WorkerPoolResource UpdateWorkerPool(this IAppServiceEnvironmentsOp
             /// Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a worker pool of an App
-            /// Service Environment.
+            /// Description for Get metric definitions for a specific instance of a worker
+            /// pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1880,8 +1626,8 @@ public static IPage<ResourceMetricDefinition> ListWorkerPoolInstanceMetricDefini
             /// Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a worker pool of an App
-            /// Service Environment.
+            /// Description for Get metric definitions for a specific instance of a worker
+            /// pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1909,93 +1655,12 @@ public static IPage<ResourceMetricDefinition> ListWorkerPoolInstanceMetricDefini
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='workerPoolName'>
-            /// Name of the worker pool.
-            /// </param>
-            /// <param name='instance'>
-            /// Name of the instance in the worker pool.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListWorkerPoolInstanceMetrics(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string workerPoolName, string instance, bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListWorkerPoolInstanceMetricsAsync(resourceGroupName, name, workerPoolName, instance, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='workerPoolName'>
-            /// Name of the worker pool.
-            /// </param>
-            /// <param name='instance'>
-            /// Name of the instance in the worker pool.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListWorkerPoolInstanceMetricsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string workerPoolName, string instance, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWorkerPoolInstanceMetricsWithHttpMessagesAsync(resourceGroupName, name, workerPoolName, instance, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get metric definitions for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a worker pool of an App Service Environment.
+            /// Description for Get metric definitions for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2018,7 +1683,8 @@ public static IPage<ResourceMetricDefinition> ListWebWorkerMetricDefinitions(thi
             /// Get metric definitions for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a worker pool of an App Service Environment.
+            /// Description for Get metric definitions for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2043,87 +1709,11 @@ public static IPage<ResourceMetricDefinition> ListWebWorkerMetricDefinitions(thi
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='workerPoolName'>
-            /// Name of worker pool
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListWebWorkerMetrics(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string workerPoolName, bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListWebWorkerMetricsAsync(resourceGroupName, name, workerPoolName, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service Environment.
-            /// </param>
-            /// <param name='workerPoolName'>
-            /// Name of worker pool
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListWebWorkerMetricsAsync(this IAppServiceEnvironmentsOperations operations, string resourceGroupName, string name, string workerPoolName, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWebWorkerMetricsWithHttpMessagesAsync(resourceGroupName, name, workerPoolName, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get available SKUs for scaling a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a worker pool.
+            /// Description for Get available SKUs for scaling a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2146,7 +1736,7 @@ public static IPage<SkuInfo> ListWorkerPoolSkus(this IAppServiceEnvironmentsOper
             /// Get available SKUs for scaling a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a worker pool.
+            /// Description for Get available SKUs for scaling a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2175,7 +1765,8 @@ public static IPage<SkuInfo> ListWorkerPoolSkus(this IAppServiceEnvironmentsOper
             /// Get usage metrics for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a worker pool of an App Service Environment.
+            /// Description for Get usage metrics for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2198,7 +1789,8 @@ public static IPage<Usage> ListWebWorkerUsages(this IAppServiceEnvironmentsOpera
             /// Get usage metrics for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a worker pool of an App Service Environment.
+            /// Description for Get usage metrics for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2227,7 +1819,7 @@ public static IPage<Usage> ListWebWorkerUsages(this IAppServiceEnvironmentsOpera
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2250,7 +1842,7 @@ public static AppServiceEnvironmentResource BeginCreateOrUpdate(this IAppService
             /// Create or update an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Create or update an App Service Environment.
+            /// Description for Create or update an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2279,7 +1871,7 @@ public static AppServiceEnvironmentResource BeginCreateOrUpdate(this IAppService
             /// Delete an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service Environment.
+            /// Description for Delete an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2304,7 +1896,7 @@ public static AppServiceEnvironmentResource BeginCreateOrUpdate(this IAppService
             /// Delete an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service Environment.
+            /// Description for Delete an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2332,7 +1924,7 @@ public static AppServiceEnvironmentResource BeginCreateOrUpdate(this IAppService
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2355,7 +1947,7 @@ public static IPage<Site> BeginChangeVnet(this IAppServiceEnvironmentsOperations
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2384,7 +1976,7 @@ public static IPage<Site> BeginChangeVnet(this IAppServiceEnvironmentsOperations
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2407,7 +1999,7 @@ public static WorkerPoolResource BeginCreateOrUpdateMultiRolePool(this IAppServi
             /// Create or update a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a multi-role pool.
+            /// Description for Create or update a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2436,7 +2028,7 @@ public static WorkerPoolResource BeginCreateOrUpdateMultiRolePool(this IAppServi
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2456,7 +2048,7 @@ public static IPage<Site> BeginResume(this IAppServiceEnvironmentsOperations ope
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2482,7 +2074,7 @@ public static IPage<Site> BeginResume(this IAppServiceEnvironmentsOperations ope
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2502,7 +2094,7 @@ public static IPage<Site> BeginSuspend(this IAppServiceEnvironmentsOperations op
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2528,7 +2120,7 @@ public static IPage<Site> BeginSuspend(this IAppServiceEnvironmentsOperations op
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2554,7 +2146,7 @@ public static WorkerPoolResource BeginCreateOrUpdateWorkerPool(this IAppServiceE
             /// Create or update a worker pool.
             /// </summary>
             /// <remarks>
-            /// Create or update a worker pool.
+            /// Description for Create or update a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2586,7 +2178,7 @@ public static WorkerPoolResource BeginCreateOrUpdateWorkerPool(this IAppServiceE
             /// Get all App Service Environments for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments for a subscription.
+            /// Description for Get all App Service Environments for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2603,7 +2195,7 @@ public static IPage<AppServiceEnvironmentResource> ListNext(this IAppServiceEnvi
             /// Get all App Service Environments for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments for a subscription.
+            /// Description for Get all App Service Environments for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2626,7 +2218,7 @@ public static IPage<AppServiceEnvironmentResource> ListNext(this IAppServiceEnvi
             /// Get all App Service Environments in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments in a resource group.
+            /// Description for Get all App Service Environments in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2643,7 +2235,7 @@ public static IPage<AppServiceEnvironmentResource> ListByResourceGroupNext(this
             /// Get all App Service Environments in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service Environments in a resource group.
+            /// Description for Get all App Service Environments in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2667,8 +2259,8 @@ public static IPage<AppServiceEnvironmentResource> ListByResourceGroupNext(this
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the used, available, and total worker capacity an App Service
-            /// Environment.
+            /// Description for Get the used, available, and total worker capacity an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2686,8 +2278,8 @@ public static IPage<StampCapacity> ListCapacitiesNext(this IAppServiceEnvironmen
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the used, available, and total worker capacity an App Service
-            /// Environment.
+            /// Description for Get the used, available, and total worker capacity an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2710,7 +2302,7 @@ public static IPage<StampCapacity> ListCapacitiesNext(this IAppServiceEnvironmen
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2727,7 +2319,7 @@ public static IPage<Site> ChangeVnetNext(this IAppServiceEnvironmentsOperations
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2751,8 +2343,8 @@ public static IPage<Site> ChangeVnetNext(this IAppServiceEnvironmentsOperations
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all inbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all inbound dependencies of an
+            /// App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2770,8 +2362,8 @@ public static IPage<InboundEnvironmentEndpoint> GetInboundNetworkDependenciesEnd
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all inbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all inbound dependencies of an
+            /// App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2790,51 +2382,11 @@ public static IPage<InboundEnvironmentEndpoint> GetInboundNetworkDependenciesEnd
                 }
             }
 
-            /// <summary>
-            /// Get global metrics of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metrics of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListMetricsNext(this IAppServiceEnvironmentsOperations operations, string nextPageLink)
-            {
-                return operations.ListMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get global metrics of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get global metrics of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsNextAsync(this IAppServiceEnvironmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get all multi-role pools.
             /// </summary>
             /// <remarks>
-            /// Get all multi-role pools.
+            /// Description for Get all multi-role pools.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2851,7 +2403,7 @@ public static IPage<WorkerPoolResource> ListMultiRolePoolsNext(this IAppServiceE
             /// Get all multi-role pools.
             /// </summary>
             /// <remarks>
-            /// Get all multi-role pools.
+            /// Description for Get all multi-role pools.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2875,8 +2427,8 @@ public static IPage<WorkerPoolResource> ListMultiRolePoolsNext(this IAppServiceE
             /// App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a multi-role pool of an
-            /// App Service Environment.
+            /// Description for Get metric definitions for a specific instance of a
+            /// multi-role pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2894,8 +2446,8 @@ public static IPage<ResourceMetricDefinition> ListMultiRolePoolInstanceMetricDef
             /// App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a multi-role pool of an
-            /// App Service Environment.
+            /// Description for Get metric definitions for a specific instance of a
+            /// multi-role pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2914,55 +2466,12 @@ public static IPage<ResourceMetricDefinition> ListMultiRolePoolInstanceMetricDef
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListMultiRolePoolInstanceMetricsNext(this IAppServiceEnvironmentsOperations operations, string nextPageLink)
-            {
-                return operations.ListMultiRolePoolInstanceMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a multi-role pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMultiRolePoolInstanceMetricsNextAsync(this IAppServiceEnvironmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMultiRolePoolInstanceMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get metric definitions for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a multi-role pool of an App Service Environment.
+            /// Description for Get metric definitions for a multi-role pool of an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2979,7 +2488,8 @@ public static IPage<ResourceMetricDefinition> ListMultiRoleMetricDefinitionsNext
             /// Get metric definitions for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a multi-role pool of an App Service Environment.
+            /// Description for Get metric definitions for a multi-role pool of an App
+            /// Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2998,51 +2508,11 @@ public static IPage<ResourceMetricDefinition> ListMultiRoleMetricDefinitionsNext
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListMultiRoleMetricsNext(this IAppServiceEnvironmentsOperations operations, string nextPageLink)
-            {
-                return operations.ListMultiRoleMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a multi-role pool of an App Service Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMultiRoleMetricsNextAsync(this IAppServiceEnvironmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMultiRoleMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get available SKUs for scaling a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a multi-role pool.
+            /// Description for Get available SKUs for scaling a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3059,7 +2529,7 @@ public static IPage<SkuInfo> ListMultiRolePoolSkusNext(this IAppServiceEnvironme
             /// Get available SKUs for scaling a multi-role pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a multi-role pool.
+            /// Description for Get available SKUs for scaling a multi-role pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3082,7 +2552,8 @@ public static IPage<SkuInfo> ListMultiRolePoolSkusNext(this IAppServiceEnvironme
             /// Get usage metrics for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a multi-role pool of an App Service Environment.
+            /// Description for Get usage metrics for a multi-role pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3099,7 +2570,8 @@ public static IPage<Usage> ListMultiRoleUsagesNext(this IAppServiceEnvironmentsO
             /// Get usage metrics for a multi-role pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a multi-role pool of an App Service Environment.
+            /// Description for Get usage metrics for a multi-role pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3123,8 +2595,8 @@ public static IPage<Usage> ListMultiRoleUsagesNext(this IAppServiceEnvironmentsO
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all outbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all outbound dependencies of
+            /// an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3142,8 +2614,8 @@ public static IPage<OutboundEnvironmentEndpoint> GetOutboundNetworkDependenciesE
             /// Environment.
             /// </summary>
             /// <remarks>
-            /// Get the network endpoints of all outbound dependencies of an App Service
-            /// Environment.
+            /// Description for Get the network endpoints of all outbound dependencies of
+            /// an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3166,7 +2638,7 @@ public static IPage<OutboundEnvironmentEndpoint> GetOutboundNetworkDependenciesE
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3183,7 +2655,7 @@ public static IPage<Site> ResumeNext(this IAppServiceEnvironmentsOperations oper
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3206,7 +2678,7 @@ public static IPage<Site> ResumeNext(this IAppServiceEnvironmentsOperations oper
             /// Get all App Service plans in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in an App Service Environment.
+            /// Description for Get all App Service plans in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3223,7 +2695,7 @@ public static IPage<AppServicePlan> ListAppServicePlansNext(this IAppServiceEnvi
             /// Get all App Service plans in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in an App Service Environment.
+            /// Description for Get all App Service plans in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3246,7 +2718,7 @@ public static IPage<AppServicePlan> ListAppServicePlansNext(this IAppServiceEnvi
             /// Get all apps in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all apps in an App Service Environment.
+            /// Description for Get all apps in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3263,7 +2735,7 @@ public static IPage<Site> ListWebAppsNext(this IAppServiceEnvironmentsOperations
             /// Get all apps in an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all apps in an App Service Environment.
+            /// Description for Get all apps in an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3286,7 +2758,7 @@ public static IPage<Site> ListWebAppsNext(this IAppServiceEnvironmentsOperations
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3303,7 +2775,7 @@ public static IPage<Site> SuspendNext(this IAppServiceEnvironmentsOperations ope
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3326,7 +2798,7 @@ public static IPage<Site> SuspendNext(this IAppServiceEnvironmentsOperations ope
             /// Get global usage metrics of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get global usage metrics of an App Service Environment.
+            /// Description for Get global usage metrics of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3343,7 +2815,7 @@ public static IPage<CsmUsageQuota> ListUsagesNext(this IAppServiceEnvironmentsOp
             /// Get global usage metrics of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get global usage metrics of an App Service Environment.
+            /// Description for Get global usage metrics of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3366,7 +2838,7 @@ public static IPage<CsmUsageQuota> ListUsagesNext(this IAppServiceEnvironmentsOp
             /// Get all worker pools of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all worker pools of an App Service Environment.
+            /// Description for Get all worker pools of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3383,7 +2855,7 @@ public static IPage<WorkerPoolResource> ListWorkerPoolsNext(this IAppServiceEnvi
             /// Get all worker pools of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get all worker pools of an App Service Environment.
+            /// Description for Get all worker pools of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3407,8 +2879,8 @@ public static IPage<WorkerPoolResource> ListWorkerPoolsNext(this IAppServiceEnvi
             /// Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a worker pool of an App
-            /// Service Environment.
+            /// Description for Get metric definitions for a specific instance of a worker
+            /// pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3426,8 +2898,8 @@ public static IPage<ResourceMetricDefinition> ListWorkerPoolInstanceMetricDefini
             /// Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a specific instance of a worker pool of an App
-            /// Service Environment.
+            /// Description for Get metric definitions for a specific instance of a worker
+            /// pool of an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3446,55 +2918,12 @@ public static IPage<ResourceMetricDefinition> ListWorkerPoolInstanceMetricDefini
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListWorkerPoolInstanceMetricsNext(this IAppServiceEnvironmentsOperations operations, string nextPageLink)
-            {
-                return operations.ListWorkerPoolInstanceMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a specific instance of a worker pool of an App Service
-            /// Environment.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListWorkerPoolInstanceMetricsNextAsync(this IAppServiceEnvironmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWorkerPoolInstanceMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get metric definitions for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a worker pool of an App Service Environment.
+            /// Description for Get metric definitions for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3511,7 +2940,8 @@ public static IPage<ResourceMetricDefinition> ListWebWorkerMetricDefinitionsNext
             /// Get metric definitions for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get metric definitions for a worker pool of an App Service Environment.
+            /// Description for Get metric definitions for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3530,55 +2960,11 @@ public static IPage<ResourceMetricDefinition> ListWebWorkerMetricDefinitionsNext
                 }
             }
 
-            /// <summary>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListWebWorkerMetricsNext(this IAppServiceEnvironmentsOperations operations, string nextPageLink)
-            {
-                return operations.ListWebWorkerMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for a worker pool of a AppServiceEnvironment (App Service
-            /// Environment).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListWebWorkerMetricsNextAsync(this IAppServiceEnvironmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListWebWorkerMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get available SKUs for scaling a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a worker pool.
+            /// Description for Get available SKUs for scaling a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3595,7 +2981,7 @@ public static IPage<SkuInfo> ListWorkerPoolSkusNext(this IAppServiceEnvironments
             /// Get available SKUs for scaling a worker pool.
             /// </summary>
             /// <remarks>
-            /// Get available SKUs for scaling a worker pool.
+            /// Description for Get available SKUs for scaling a worker pool.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3618,7 +3004,8 @@ public static IPage<SkuInfo> ListWorkerPoolSkusNext(this IAppServiceEnvironments
             /// Get usage metrics for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a worker pool of an App Service Environment.
+            /// Description for Get usage metrics for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3635,7 +3022,8 @@ public static IPage<Usage> ListWebWorkerUsagesNext(this IAppServiceEnvironmentsO
             /// Get usage metrics for a worker pool of an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Get usage metrics for a worker pool of an App Service Environment.
+            /// Description for Get usage metrics for a worker pool of an App Service
+            /// Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3658,7 +3046,7 @@ public static IPage<Usage> ListWebWorkerUsagesNext(this IAppServiceEnvironmentsO
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3675,7 +3063,7 @@ public static IPage<Site> BeginChangeVnetNext(this IAppServiceEnvironmentsOperat
             /// Move an App Service Environment to a different VNET.
             /// </summary>
             /// <remarks>
-            /// Move an App Service Environment to a different VNET.
+            /// Description for Move an App Service Environment to a different VNET.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3698,7 +3086,7 @@ public static IPage<Site> BeginChangeVnetNext(this IAppServiceEnvironmentsOperat
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3715,7 +3103,7 @@ public static IPage<Site> BeginResumeNext(this IAppServiceEnvironmentsOperations
             /// Resume an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Resume an App Service Environment.
+            /// Description for Resume an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3738,7 +3126,7 @@ public static IPage<Site> BeginResumeNext(this IAppServiceEnvironmentsOperations
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3755,7 +3143,7 @@ public static IPage<Site> BeginSuspendNext(this IAppServiceEnvironmentsOperation
             /// Suspend an App Service Environment.
             /// </summary>
             /// <remarks>
-            /// Suspend an App Service Environment.
+            /// Description for Suspend an App Service Environment.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs
index 0f4a91b6abe8..f0fd1ce9ff47 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperations.cs
@@ -54,7 +54,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get all App Service plans for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans for a subscription.
+        /// Description for Get all App Service plans for a subscription.
         /// </remarks>
         /// <param name='detailed'>
         /// Specify &lt;code&gt;true&lt;/code&gt; to return all App Service plan
@@ -89,7 +89,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -98,7 +101,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("detailed", detailed);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -111,9 +113,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("detailed={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(detailed, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -239,7 +241,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get all App Service plans in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in a resource group.
+        /// Description for Get all App Service plans in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -290,7 +292,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -299,7 +304,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -309,9 +313,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -437,7 +441,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get an App Service plan.
+        /// Description for Get an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -451,7 +455,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -495,7 +499,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -505,7 +512,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -516,9 +522,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -580,14 +586,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -597,10 +602,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -649,7 +650,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Creates or updates an App Service Plan.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -677,7 +678,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Delete an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Delete an App Service plan.
+        /// Description for Delete an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -691,7 +692,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -732,7 +733,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -742,7 +746,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters);
             }
@@ -753,9 +756,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -817,14 +820,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -834,10 +836,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -868,7 +866,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Creates or updates an App Service Plan.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -933,7 +931,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -944,7 +945,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("appServicePlan", appServicePlan);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -955,9 +955,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1107,7 +1107,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// List all capabilities of an App Service plan.
         /// </summary>
         /// <remarks>
-        /// List all capabilities of an App Service plan.
+        /// Description for List all capabilities of an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1165,7 +1165,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1175,7 +1178,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListCapabilities", tracingParameters);
             }
@@ -1186,9 +1188,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1314,7 +1316,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Retrieve a Hybrid Connection in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Retrieve a Hybrid Connection in use in an App Service plan.
+        /// Description for Retrieve a Hybrid Connection in use in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1386,7 +1388,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1398,7 +1403,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHybridConnection", tracingParameters);
             }
@@ -1411,9 +1415,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1539,7 +1543,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Delete a Hybrid Connection in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Delete a Hybrid Connection in use in an App Service plan.
+        /// Description for Delete a Hybrid Connection in use in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1559,7 +1563,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1608,7 +1612,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1620,7 +1627,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteHybridConnection", tracingParameters);
             }
@@ -1633,9 +1639,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1697,14 +1703,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1714,10 +1719,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -1748,7 +1749,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get the send key name and value of a Hybrid Connection.
         /// </summary>
         /// <remarks>
-        /// Get the send key name and value of a Hybrid Connection.
+        /// Description for Get the send key name and value of a Hybrid Connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1820,7 +1821,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1832,7 +1836,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionKeys", tracingParameters);
             }
@@ -1845,9 +1848,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1973,7 +1976,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get all apps that use a Hybrid Connection in an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps that use a Hybrid Connection in an App Service Plan.
+        /// Description for Get all apps that use a Hybrid Connection in an App Service
+        /// Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2045,7 +2049,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2057,7 +2064,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListWebAppsByHybridConnection", tracingParameters);
             }
@@ -2070,9 +2076,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2199,8 +2205,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// plan.
         /// </summary>
         /// <remarks>
-        /// Get the maximum number of Hybrid Connections allowed in an App Service
-        /// plan.
+        /// Description for Get the maximum number of Hybrid Connections allowed in an
+        /// App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2258,7 +2264,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2268,7 +2277,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHybridConnectionPlanLimit", tracingParameters);
             }
@@ -2279,9 +2287,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2407,7 +2415,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Retrieve all Hybrid Connections in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Retrieve all Hybrid Connections in use in an App Service plan.
+        /// Description for Retrieve all Hybrid Connections in use in an App Service
+        /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2465,7 +2474,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2475,7 +2487,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnections", tracingParameters);
             }
@@ -2486,9 +2497,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2611,12 +2622,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
+        /// Restart all apps in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
+        /// Description for Restart all apps in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2624,6 +2633,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service plan.
         /// </param>
+        /// <param name='softRestart'>
+        /// Specify &lt;code&gt;true&lt;/code&gt; to perform a soft restart, applies
+        /// the configuration settings and restarts the apps if necessary. The default
+        /// is &lt;code&gt;false&lt;/code&gt;, which always restarts and reprovisions
+        /// the apps
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -2633,9 +2648,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -2645,7 +2657,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefintionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> RestartWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, bool? softRestart = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2674,7 +2686,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2684,20 +2699,24 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("softRestart", softRestart);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefintions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "RestartWebApps", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/restartSites").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (softRestart != null)
+            {
+                _queryParameters.Add(string.Format("softRestart={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(softRestart, Client.SerializationSettings).Trim('"'))));
+            }
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2706,7 +2725,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -2757,7 +2776,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 204)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -2787,31 +2806,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -2820,10 +2821,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for an App Service plan.
+        /// Get all apps associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get metrics for an App Service plan.
+        /// Description for Get all apps associated with an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2831,15 +2832,18 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service plan.
         /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-        /// default is &lt;code&gt;false&lt;/code&gt;.
+        /// <param name='skipToken'>
+        /// Skip to a web app in the list of webapps associated with app service plan.
+        /// If specified, the resulting list will contain web apps starting from
+        /// (including) the skipToken. Otherwise, the resulting list contains web apps
+        /// from the start of the list
         /// </param>
         /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// Supported filter: $filter=state eq running. Returns only web apps that are
+        /// currently running
+        /// </param>
+        /// <param name='top'>
+        /// List page size. If specified, results are paged.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2862,7 +2866,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, string skipToken = default(string), string filter = default(string), string top = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2891,7 +2895,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2901,30 +2908,34 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("details", details);
+                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("top", top);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebApps", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/sites").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
+            if (skipToken != null)
             {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
+                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
             }
             if (filter != null)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (top != null)
+            {
+                _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(top)));
+            }
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3014,7 +3025,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3027,7 +3038,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3047,22 +3058,16 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Restart all apps in an App Service plan.
+        /// Gets all selectable SKUs for a given App Service Plan
         /// </summary>
         /// <remarks>
-        /// Restart all apps in an App Service plan.
+        /// Description for Gets all selectable SKUs for a given App Service Plan
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='softRestart'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to perform a soft restart, applies
-        /// the configuration settings and restarts the apps if necessary. The default
-        /// is &lt;code&gt;false&lt;/code&gt;, which always restarts and reprovisions
-        /// the apps
+        /// Name of App Service Plan
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3070,9 +3075,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -3082,7 +3090,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> RestartWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, bool? softRestart = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<object>> GetServerFarmSkusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3111,7 +3119,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3121,25 +3132,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("softRestart", softRestart);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "RestartWebApps", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetServerFarmSkus", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/restartSites").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/skus").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (softRestart != null)
-            {
-                _queryParameters.Add(string.Format("softRestart={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(softRestart, Client.SerializationSettings).Trim('"'))));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3148,7 +3153,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -3199,16 +3204,15 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -3218,10 +3222,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -3234,13 +3234,31 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<object>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<object>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -3249,29 +3267,21 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all apps associated with an App Service plan.
+        /// Gets server farm usage information
         /// </summary>
         /// <remarks>
-        /// Get all apps associated with an App Service plan.
+        /// Description for Gets server farm usage information
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='skipToken'>
-        /// Skip to a web app in the list of webapps associated with app service plan.
-        /// If specified, the resulting list will contain web apps starting from
-        /// (including) the skipToken. Otherwise, the resulting list contains web apps
-        /// from the start of the list
+        /// Name of App Service Plan
         /// </param>
         /// <param name='filter'>
-        /// Supported filter: $filter=state eq running. Returns only web apps that are
-        /// currently running
-        /// </param>
-        /// <param name='top'>
-        /// List page size. If specified, results are paged.
+        /// Return only usages/metrics specified in the filter. Filter conforms to
+        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
+        /// 'Metric2').
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3294,7 +3304,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListWebAppsWithHttpMessagesAsync(string resourceGroupName, string name, string skipToken = default(string), string filter = default(string), string top = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3323,7 +3333,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3333,35 +3346,24 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("skipToken", skipToken);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("top", top);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebApps", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListUsages", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/sites").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/usages").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (skipToken != null)
-            {
-                _queryParameters.Add(string.Format("$skipToken={0}", System.Uri.EscapeDataString(skipToken)));
-            }
             if (filter != null)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (top != null)
-            {
-                _queryParameters.Add(string.Format("$top={0}", System.Uri.EscapeDataString(top)));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3451,7 +3453,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
+            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3464,7 +3466,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3484,16 +3486,17 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all selectable SKUs for a given App Service Plan
+        /// Get all Virtual Networks associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Gets all selectable SKUs for a given App Service Plan
+        /// Description for Get all Virtual Networks associated with an App Service
+        /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of App Service Plan
+        /// Name of the App Service plan.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3516,7 +3519,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<object>> GetServerFarmSkusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<VnetInfo>>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3545,7 +3548,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3555,20 +3561,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetServerFarmSkus", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListVnets", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/skus").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3658,7 +3663,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<object>();
+            var _result = new AzureOperationResponse<IList<VnetInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3671,7 +3676,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<object>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3691,21 +3696,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets server farm usage information
+        /// Get a Virtual Network associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Gets server farm usage information
+        /// Description for Get a Virtual Network associated with an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of App Service Plan
+        /// Name of the App Service plan.
         /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms to
-        /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2').
+        /// <param name='vnetName'>
+        /// Name of the Virtual Network.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -3728,7 +3731,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<CsmUsageQuota>>> ListUsagesWithHttpMessagesAsync(string resourceGroupName, string name, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VnetInfo>> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3753,11 +3756,18 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (vnetName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3767,25 +3777,21 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListUsages", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetVnetFromServerFarm", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/usages").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3845,7 +3851,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -3875,7 +3881,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<CsmUsageQuota>>();
+            var _result = new AzureOperationResponse<VnetInfo>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -3888,7 +3894,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<CsmUsageQuota>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetInfo>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -3908,10 +3914,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all Virtual Networks associated with an App Service plan.
+        /// Get a Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Get all Virtual Networks associated with an App Service plan.
+        /// Description for Get a Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3919,6 +3925,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the App Service plan.
         /// </param>
+        /// <param name='vnetName'>
+        /// Name of the Virtual Network.
+        /// </param>
+        /// <param name='gatewayName'>
+        /// Name of the gateway. Only the 'primary' gateway is supported.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -3940,7 +3952,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<VnetInfo>>> ListVnetsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VnetGateway>> GetVnetGatewayWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string gatewayName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3965,11 +3977,22 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (vnetName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
+            }
+            if (gatewayName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "gatewayName");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3979,20 +4002,23 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("vnetName", vnetName);
+                tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListVnets", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetVnetGateway", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
+            _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4082,7 +4108,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<VnetInfo>>();
+            var _result = new AzureOperationResponse<VnetGateway>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4095,7 +4121,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetGateway>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4115,10 +4141,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get a Virtual Network associated with an App Service plan.
+        /// Update a Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network associated with an App Service plan.
+        /// Description for Update a Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4129,13 +4155,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='vnetName'>
         /// Name of the Virtual Network.
         /// </param>
+        /// <param name='gatewayName'>
+        /// Name of the gateway. Only the 'primary' gateway is supported.
+        /// </param>
+        /// <param name='connectionEnvelope'>
+        /// Definition of the gateway.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -4150,7 +4182,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VnetInfo>> GetVnetFromServerFarmWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VnetGateway>> UpdateVnetGatewayWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string gatewayName, VnetGateway connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4179,11 +4211,26 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
             }
+            if (gatewayName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "gatewayName");
+            }
+            if (connectionEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+            }
+            if (connectionEnvelope != null)
+            {
+                connectionEnvelope.Validate();
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4194,21 +4241,23 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("gatewayName", gatewayName);
+                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetVnetFromServerFarm", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetGateway", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
+            _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4217,7 +4266,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -4248,6 +4297,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -4268,16 +4323,15 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -4287,10 +4341,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -4303,7 +4353,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<VnetInfo>();
+            var _result = new AzureOperationResponse<VnetGateway>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4316,7 +4366,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetGateway>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4336,10 +4386,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get a Virtual Network gateway.
+        /// Get all routes that are associated with a Virtual Network in an App Service
+        /// plan.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network gateway.
+        /// Description for Get all routes that are associated with a Virtual Network
+        /// in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4350,9 +4402,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='vnetName'>
         /// Name of the Virtual Network.
         /// </param>
-        /// <param name='gatewayName'>
-        /// Name of the gateway. Only the 'primary' gateway is supported.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -4374,7 +4423,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VnetGateway>> GetVnetGatewayWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string gatewayName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<VnetRoute>>> ListRoutesForVnetWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4403,15 +4452,14 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
             }
-            if (gatewayName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "gatewayName");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4422,23 +4470,20 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("gatewayName", gatewayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetVnetGateway", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListRoutesForVnet", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
-            _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4528,7 +4573,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<VnetGateway>();
+            var _result = new AzureOperationResponse<IList<VnetRoute>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4541,7 +4586,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetGateway>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetRoute>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4561,10 +4606,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Update a Virtual Network gateway.
+        /// Get a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Update a Virtual Network gateway.
+        /// Description for Get a Virtual Network route in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4575,11 +4620,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='vnetName'>
         /// Name of the Virtual Network.
         /// </param>
-        /// <param name='gatewayName'>
-        /// Name of the gateway. Only the 'primary' gateway is supported.
-        /// </param>
-        /// <param name='connectionEnvelope'>
-        /// Definition of the gateway.
+        /// <param name='routeName'>
+        /// Name of the Virtual Network route.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -4602,7 +4644,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VnetGateway>> UpdateVnetGatewayWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string gatewayName, VnetGateway connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<VnetRoute>>> GetRouteForVnetWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4631,23 +4673,18 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
             }
-            if (gatewayName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "gatewayName");
-            }
-            if (connectionEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
-            }
-            if (connectionEnvelope != null)
+            if (routeName == null)
             {
-                connectionEnvelope.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "routeName");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4658,24 +4695,22 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("gatewayName", gatewayName);
-                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("routeName", routeName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetGateway", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetRouteForVnet", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/gateways/{gatewayName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
-            _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
+            _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4684,7 +4719,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -4715,12 +4750,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -4741,7 +4770,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -4771,7 +4800,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<VnetGateway>();
+            var _result = new AzureOperationResponse<IList<VnetRoute>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4784,7 +4813,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetGateway>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetRoute>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4804,11 +4833,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all routes that are associated with a Virtual Network in an App Service
-        /// plan.
+        /// Create or update a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all routes that are associated with a Virtual Network in an App Service
+        /// Description for Create or update a Virtual Network route in an App Service
         /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -4820,6 +4848,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='vnetName'>
         /// Name of the Virtual Network.
         /// </param>
+        /// <param name='routeName'>
+        /// Name of the Virtual Network route.
+        /// </param>
+        /// <param name='route'>
+        /// Definition of the Virtual Network route.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -4841,7 +4875,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<VnetRoute>>> ListRoutesForVnetWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VnetRoute>> CreateOrUpdateVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, VnetRoute route, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4870,11 +4904,22 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
             }
+            if (routeName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "routeName");
+            }
+            if (route == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "route");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4885,21 +4930,23 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("routeName", routeName);
+                tracingParameters.Add("route", route);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListRoutesForVnet", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetRoute", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
+            _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4908,7 +4955,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -4939,6 +4986,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(route != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(route, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -4959,7 +5012,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 400 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -4989,7 +5042,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<VnetRoute>>();
+            var _result = new AzureOperationResponse<VnetRoute>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5002,7 +5055,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetRoute>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetRoute>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5022,10 +5075,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get a Virtual Network route in an App Service plan.
+        /// Delete a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network route in an App Service plan.
+        /// Description for Delete a Virtual Network route in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5045,12 +5098,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -5060,7 +5110,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<VnetRoute>>> GetRouteForVnetWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> DeleteVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5097,7 +5147,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5109,9 +5162,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("routeName", routeName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetRouteForVnet", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteVnetRoute", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -5122,9 +5174,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5133,7 +5185,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5186,14 +5238,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -5203,10 +5254,6 @@ internal AppServicePlansOperations(WebSiteManagementClient 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);
@@ -5219,32 +5266,14 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<VnetRoute>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<VnetRoute>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
+            if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
             }
@@ -5255,7 +5284,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Create or update a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Create or update a Virtual Network route in an App Service plan.
+        /// Description for Create or update a Virtual Network route in an App Service
+        /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5278,7 +5308,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -5293,7 +5323,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<VnetRoute>> CreateOrUpdateVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, VnetRoute route, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<VnetRoute>> UpdateVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, VnetRoute route, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5334,7 +5364,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5347,9 +5380,8 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("routeName", routeName);
                 tracingParameters.Add("route", route);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetRoute", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetRoute", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -5360,9 +5392,9 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5371,7 +5403,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5430,967 +5462,48 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 400 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<VnetRoute>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetRoute>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Delete a Virtual Network route in an App Service plan.
-        /// </summary>
-        /// <remarks>
-        /// Delete a Virtual Network route in an App Service plan.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='vnetName'>
-        /// Name of the Virtual Network.
-        /// </param>
-        /// <param name='routeName'>
-        /// Name of the Virtual Network route.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> DeleteVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (vnetName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
-            }
-            if (routeName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "routeName");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("routeName", routeName);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteVnetRoute", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
-            _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
                 catch (JsonException)
                 {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Create or update a Virtual Network route in an App Service plan.
-        /// </summary>
-        /// <remarks>
-        /// Create or update a Virtual Network route in an App Service plan.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='vnetName'>
-        /// Name of the Virtual Network.
-        /// </param>
-        /// <param name='routeName'>
-        /// Name of the Virtual Network route.
-        /// </param>
-        /// <param name='route'>
-        /// Definition of the Virtual Network route.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<VnetRoute>> UpdateVnetRouteWithHttpMessagesAsync(string resourceGroupName, string name, string vnetName, string routeName, VnetRoute route, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (vnetName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "vnetName");
-            }
-            if (routeName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "routeName");
-            }
-            if (route == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "route");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("routeName", routeName);
-                tracingParameters.Add("route", route);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetRoute", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/virtualNetworkConnections/{vnetName}/routes/{routeName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
-            _url = _url.Replace("{routeName}", System.Uri.EscapeDataString(routeName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(route != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(route, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 400 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<VnetRoute>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetRoute>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Reboot a worker machine in an App Service plan.
-        /// </summary>
-        /// <remarks>
-        /// Reboot a worker machine in an App Service plan.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='workerName'>
-        /// Name of worker machine, which typically starts with RD.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> RebootWorkerWithHttpMessagesAsync(string resourceGroupName, string name, string workerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (workerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "workerName");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("workerName", workerName);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "RebootWorker", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/workers/{workerName}/reboot").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{workerName}", System.Uri.EscapeDataString(workerName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 204)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Creates or updates an App Service Plan.
-        /// </summary>
-        /// <remarks>
-        /// Creates or updates an App Service Plan.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='appServicePlan'>
-        /// Details of the App Service plan.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<AppServicePlan>> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, AppServicePlan appServicePlan, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (appServicePlan == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "appServicePlan");
-            }
-            if (appServicePlan != null)
-            {
-                appServicePlan.Validate();
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("appServicePlan", appServicePlan);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(appServicePlan != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(appServicePlan, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<AppServicePlan>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServicePlan>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 201)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServicePlan>(_responseContent, Client.DeserializationSettings);
+                    // Ignore the exception
                 }
-                catch (JsonException ex)
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
                 {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
                 }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<VnetRoute>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 202)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServicePlan>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<VnetRoute>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6410,13 +5523,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all App Service plans for a subscription.
+        /// Reboot a worker machine in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans for a subscription.
+        /// Description for Reboot a worker machine in an App Service plan.
         /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service plan.
+        /// </param>
+        /// <param name='workerName'>
+        /// Name of worker machine, which typically starts with RD.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6427,9 +5546,6 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -6439,11 +5555,42 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> RebootWorkerWithHttpMessagesAsync(string resourceGroupName, string name, string workerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (nextPageLink == null)
+            if (resourceGroupName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (workerName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "workerName");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -6452,14 +5599,24 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("workerName", workerName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "RebootWorker", tracingParameters);
             }
             // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}/workers/{workerName}/reboot").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{workerName}", System.Uri.EscapeDataString(workerName));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -6467,7 +5624,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6518,7 +5675,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 204)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -6548,31 +5705,13 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -6581,13 +5720,19 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all App Service plans in a resource group.
+        /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in a resource group.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the App Service plan.
+        /// </param>
+        /// <param name='appServicePlan'>
+        /// Details of the App Service plan.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6610,11 +5755,46 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AppServicePlan>> BeginCreateOrUpdateWithHttpMessagesAsync(string resourceGroupName, string name, AppServicePlan appServicePlan, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (nextPageLink == null)
+            if (resourceGroupName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (appServicePlan == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "appServicePlan");
+            }
+            if (appServicePlan != null)
+            {
+                appServicePlan.Validate();
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -6623,14 +5803,23 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("appServicePlan", appServicePlan);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
             }
             // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/serverfarms/{name}").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -6638,7 +5827,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6669,6 +5858,12 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(appServicePlan != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(appServicePlan, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6689,7 +5884,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -6719,7 +5914,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
+            var _result = new AzureOperationResponse<AppServicePlan>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6732,7 +5927,25 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServicePlan>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AppServicePlan>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6752,10 +5965,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all apps that use a Hybrid Connection in an App Service Plan.
+        /// Get all App Service plans for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all apps that use a Hybrid Connection in an App Service Plan.
+        /// Description for Get all App Service plans for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6781,7 +5994,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<string>>> ListWebAppsByHybridConnectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -6796,7 +6009,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListWebAppsByHybridConnectionNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -6890,7 +6103,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<string>>();
+            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6903,7 +6116,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<string>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6923,10 +6136,10 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Retrieve all Hybrid Connections in use in an App Service plan.
+        /// Get all App Service plans in a resource group.
         /// </summary>
         /// <remarks>
-        /// Retrieve all Hybrid Connections in use in an App Service plan.
+        /// Description for Get all App Service plans in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6952,7 +6165,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<HybridConnection>>> ListHybridConnectionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<AppServicePlan>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -6967,7 +6180,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -7061,7 +6274,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<HybridConnection>>();
+            var _result = new AzureOperationResponse<IPage<AppServicePlan>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7074,7 +6287,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HybridConnection>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<AppServicePlan>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7094,12 +6307,11 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
+        /// Get all apps that use a Hybrid Connection in an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
+        /// Description for Get all apps that use a Hybrid Connection in an App Service
+        /// Plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -7125,7 +6337,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefintionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<string>>> ListWebAppsByHybridConnectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -7140,7 +6352,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefintionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListWebAppsByHybridConnectionNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -7234,7 +6446,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<string>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7247,7 +6459,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<string>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7267,10 +6479,11 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get metrics for an App Service plan.
+        /// Retrieve all Hybrid Connections in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get metrics for an App Service plan.
+        /// Description for Retrieve all Hybrid Connections in use in an App Service
+        /// plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -7296,7 +6509,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<HybridConnection>>> ListHybridConnectionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -7311,7 +6524,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -7405,7 +6618,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<HybridConnection>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7418,7 +6631,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HybridConnection>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7441,7 +6654,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Get all apps associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps associated with an App Service plan.
+        /// Description for Get all apps associated with an App Service plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -7612,7 +6825,7 @@ internal AppServicePlansOperations(WebSiteManagementClient client)
         /// Gets server farm usage information
         /// </summary>
         /// <remarks>
-        /// Gets server farm usage information
+        /// Description for Gets server farm usage information
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs
index 28675f6ad6c4..023addb2962b 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/AppServicePlansOperationsExtensions.cs
@@ -27,7 +27,7 @@ public static partial class AppServicePlansOperationsExtensions
             /// Get all App Service plans for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans for a subscription.
+            /// Description for Get all App Service plans for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -47,7 +47,7 @@ public static partial class AppServicePlansOperationsExtensions
             /// Get all App Service plans for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans for a subscription.
+            /// Description for Get all App Service plans for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -73,7 +73,7 @@ public static partial class AppServicePlansOperationsExtensions
             /// Get all App Service plans in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in a resource group.
+            /// Description for Get all App Service plans in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -90,7 +90,7 @@ public static IPage<AppServicePlan> ListByResourceGroup(this IAppServicePlansOpe
             /// Get all App Service plans in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in a resource group.
+            /// Description for Get all App Service plans in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -113,7 +113,7 @@ public static IPage<AppServicePlan> ListByResourceGroup(this IAppServicePlansOpe
             /// Get an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get an App Service plan.
+            /// Description for Get an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -133,7 +133,7 @@ public static AppServicePlan Get(this IAppServicePlansOperations operations, str
             /// Get an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get an App Service plan.
+            /// Description for Get an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -159,7 +159,7 @@ public static AppServicePlan Get(this IAppServicePlansOperations operations, str
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -182,7 +182,7 @@ public static AppServicePlan CreateOrUpdate(this IAppServicePlansOperations oper
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -211,7 +211,7 @@ public static AppServicePlan CreateOrUpdate(this IAppServicePlansOperations oper
             /// Delete an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service plan.
+            /// Description for Delete an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -231,7 +231,7 @@ public static void Delete(this IAppServicePlansOperations operations, string res
             /// Delete an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete an App Service plan.
+            /// Description for Delete an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -254,7 +254,7 @@ public static void Delete(this IAppServicePlansOperations operations, string res
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -277,7 +277,7 @@ public static AppServicePlan Update(this IAppServicePlansOperations operations,
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -306,7 +306,7 @@ public static AppServicePlan Update(this IAppServicePlansOperations operations,
             /// List all capabilities of an App Service plan.
             /// </summary>
             /// <remarks>
-            /// List all capabilities of an App Service plan.
+            /// Description for List all capabilities of an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -326,7 +326,7 @@ public static IList<Capability> ListCapabilities(this IAppServicePlansOperations
             /// List all capabilities of an App Service plan.
             /// </summary>
             /// <remarks>
-            /// List all capabilities of an App Service plan.
+            /// Description for List all capabilities of an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -352,7 +352,7 @@ public static IList<Capability> ListCapabilities(this IAppServicePlansOperations
             /// Retrieve a Hybrid Connection in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve a Hybrid Connection in use in an App Service plan.
+            /// Description for Retrieve a Hybrid Connection in use in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -378,7 +378,7 @@ public static HybridConnection GetHybridConnection(this IAppServicePlansOperatio
             /// Retrieve a Hybrid Connection in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve a Hybrid Connection in use in an App Service plan.
+            /// Description for Retrieve a Hybrid Connection in use in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -410,7 +410,7 @@ public static HybridConnection GetHybridConnection(this IAppServicePlansOperatio
             /// Delete a Hybrid Connection in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete a Hybrid Connection in use in an App Service plan.
+            /// Description for Delete a Hybrid Connection in use in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -436,7 +436,7 @@ public static void DeleteHybridConnection(this IAppServicePlansOperations operat
             /// Delete a Hybrid Connection in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete a Hybrid Connection in use in an App Service plan.
+            /// Description for Delete a Hybrid Connection in use in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -465,7 +465,7 @@ public static void DeleteHybridConnection(this IAppServicePlansOperations operat
             /// Get the send key name and value of a Hybrid Connection.
             /// </summary>
             /// <remarks>
-            /// Get the send key name and value of a Hybrid Connection.
+            /// Description for Get the send key name and value of a Hybrid Connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -491,7 +491,7 @@ public static HybridConnectionKey ListHybridConnectionKeys(this IAppServicePlans
             /// Get the send key name and value of a Hybrid Connection.
             /// </summary>
             /// <remarks>
-            /// Get the send key name and value of a Hybrid Connection.
+            /// Description for Get the send key name and value of a Hybrid Connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -523,7 +523,8 @@ public static HybridConnectionKey ListHybridConnectionKeys(this IAppServicePlans
             /// Get all apps that use a Hybrid Connection in an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps that use a Hybrid Connection in an App Service Plan.
+            /// Description for Get all apps that use a Hybrid Connection in an App Service
+            /// Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -549,7 +550,8 @@ public static IPage<string> ListWebAppsByHybridConnection(this IAppServicePlansO
             /// Get all apps that use a Hybrid Connection in an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps that use a Hybrid Connection in an App Service Plan.
+            /// Description for Get all apps that use a Hybrid Connection in an App Service
+            /// Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -582,8 +584,8 @@ public static IPage<string> ListWebAppsByHybridConnection(this IAppServicePlansO
             /// plan.
             /// </summary>
             /// <remarks>
-            /// Get the maximum number of Hybrid Connections allowed in an App Service
-            /// plan.
+            /// Description for Get the maximum number of Hybrid Connections allowed in an
+            /// App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -604,8 +606,8 @@ public static HybridConnectionLimits GetHybridConnectionPlanLimit(this IAppServi
             /// plan.
             /// </summary>
             /// <remarks>
-            /// Get the maximum number of Hybrid Connections allowed in an App Service
-            /// plan.
+            /// Description for Get the maximum number of Hybrid Connections allowed in an
+            /// App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -631,7 +633,8 @@ public static HybridConnectionLimits GetHybridConnectionPlanLimit(this IAppServi
             /// Retrieve all Hybrid Connections in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve all Hybrid Connections in use in an App Service plan.
+            /// Description for Retrieve all Hybrid Connections in use in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -651,7 +654,8 @@ public static IPage<HybridConnection> ListHybridConnections(this IAppServicePlan
             /// Retrieve all Hybrid Connections in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve all Hybrid Connections in use in an App Service plan.
+            /// Description for Retrieve all Hybrid Connections in use in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -673,127 +677,11 @@ public static IPage<HybridConnection> ListHybridConnections(this IAppServicePlan
                 }
             }
 
-            /// <summary>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service plan.
-            /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefintions(this IAppServicePlansOperations operations, string resourceGroupName, string name)
-            {
-                return operations.ListMetricDefintionsAsync(resourceGroupName, name).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service plan.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefintionsAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricDefintionsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Get metrics for an App Service plan.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for an App Service plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service plan.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListMetrics(this IAppServicePlansOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListMetricsAsync(resourceGroupName, name, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for an App Service plan.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for an App Service plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the App Service plan.
-            /// </param>
-            /// <param name='details'>
-            /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details. The
-            /// default is &lt;code&gt;false&lt;/code&gt;.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only usages/metrics specified in the filter. Filter conforms to
-            /// odata syntax. Example: $filter=(name.value eq 'Metric1' or name.value eq
-            /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-            /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsAsync(this IAppServicePlansOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricsWithHttpMessagesAsync(resourceGroupName, name, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Restart all apps in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Restart all apps in an App Service plan.
+            /// Description for Restart all apps in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -819,7 +707,7 @@ public static IPage<ResourceMetricDefinition> ListMetricDefintions(this IAppServ
             /// Restart all apps in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Restart all apps in an App Service plan.
+            /// Description for Restart all apps in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -848,7 +736,7 @@ public static IPage<ResourceMetricDefinition> ListMetricDefintions(this IAppServ
             /// Get all apps associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps associated with an App Service plan.
+            /// Description for Get all apps associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -881,7 +769,7 @@ public static IPage<ResourceMetricDefinition> ListMetricDefintions(this IAppServ
             /// Get all apps associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps associated with an App Service plan.
+            /// Description for Get all apps associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -920,7 +808,7 @@ public static IPage<ResourceMetricDefinition> ListMetricDefintions(this IAppServ
             /// Gets all selectable SKUs for a given App Service Plan
             /// </summary>
             /// <remarks>
-            /// Gets all selectable SKUs for a given App Service Plan
+            /// Description for Gets all selectable SKUs for a given App Service Plan
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -940,7 +828,7 @@ public static object GetServerFarmSkus(this IAppServicePlansOperations operation
             /// Gets all selectable SKUs for a given App Service Plan
             /// </summary>
             /// <remarks>
-            /// Gets all selectable SKUs for a given App Service Plan
+            /// Description for Gets all selectable SKUs for a given App Service Plan
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -966,7 +854,7 @@ public static object GetServerFarmSkus(this IAppServicePlansOperations operation
             /// Gets server farm usage information
             /// </summary>
             /// <remarks>
-            /// Gets server farm usage information
+            /// Description for Gets server farm usage information
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -991,7 +879,7 @@ public static object GetServerFarmSkus(this IAppServicePlansOperations operation
             /// Gets server farm usage information
             /// </summary>
             /// <remarks>
-            /// Gets server farm usage information
+            /// Description for Gets server farm usage information
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1022,7 +910,8 @@ public static object GetServerFarmSkus(this IAppServicePlansOperations operation
             /// Get all Virtual Networks associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all Virtual Networks associated with an App Service plan.
+            /// Description for Get all Virtual Networks associated with an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1042,7 +931,8 @@ public static IList<VnetInfo> ListVnets(this IAppServicePlansOperations operatio
             /// Get all Virtual Networks associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all Virtual Networks associated with an App Service plan.
+            /// Description for Get all Virtual Networks associated with an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1068,7 +958,7 @@ public static IList<VnetInfo> ListVnets(this IAppServicePlansOperations operatio
             /// Get a Virtual Network associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network associated with an App Service plan.
+            /// Description for Get a Virtual Network associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1091,7 +981,7 @@ public static VnetInfo GetVnetFromServerFarm(this IAppServicePlansOperations ope
             /// Get a Virtual Network associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network associated with an App Service plan.
+            /// Description for Get a Virtual Network associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1120,7 +1010,7 @@ public static VnetInfo GetVnetFromServerFarm(this IAppServicePlansOperations ope
             /// Get a Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network gateway.
+            /// Description for Get a Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1146,7 +1036,7 @@ public static VnetGateway GetVnetGateway(this IAppServicePlansOperations operati
             /// Get a Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network gateway.
+            /// Description for Get a Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1178,7 +1068,7 @@ public static VnetGateway GetVnetGateway(this IAppServicePlansOperations operati
             /// Update a Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Update a Virtual Network gateway.
+            /// Description for Update a Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1207,7 +1097,7 @@ public static VnetGateway UpdateVnetGateway(this IAppServicePlansOperations oper
             /// Update a Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Update a Virtual Network gateway.
+            /// Description for Update a Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1243,8 +1133,8 @@ public static VnetGateway UpdateVnetGateway(this IAppServicePlansOperations oper
             /// plan.
             /// </summary>
             /// <remarks>
-            /// Get all routes that are associated with a Virtual Network in an App Service
-            /// plan.
+            /// Description for Get all routes that are associated with a Virtual Network
+            /// in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1268,8 +1158,8 @@ public static IList<VnetRoute> ListRoutesForVnet(this IAppServicePlansOperations
             /// plan.
             /// </summary>
             /// <remarks>
-            /// Get all routes that are associated with a Virtual Network in an App Service
-            /// plan.
+            /// Description for Get all routes that are associated with a Virtual Network
+            /// in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1298,7 +1188,7 @@ public static IList<VnetRoute> ListRoutesForVnet(this IAppServicePlansOperations
             /// Get a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network route in an App Service plan.
+            /// Description for Get a Virtual Network route in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1324,7 +1214,7 @@ public static IList<VnetRoute> GetRouteForVnet(this IAppServicePlansOperations o
             /// Get a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get a Virtual Network route in an App Service plan.
+            /// Description for Get a Virtual Network route in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1356,7 +1246,8 @@ public static IList<VnetRoute> GetRouteForVnet(this IAppServicePlansOperations o
             /// Create or update a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Create or update a Virtual Network route in an App Service plan.
+            /// Description for Create or update a Virtual Network route in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1385,7 +1276,8 @@ public static VnetRoute CreateOrUpdateVnetRoute(this IAppServicePlansOperations
             /// Create or update a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Create or update a Virtual Network route in an App Service plan.
+            /// Description for Create or update a Virtual Network route in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1420,7 +1312,7 @@ public static VnetRoute CreateOrUpdateVnetRoute(this IAppServicePlansOperations
             /// Delete a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete a Virtual Network route in an App Service plan.
+            /// Description for Delete a Virtual Network route in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1446,7 +1338,7 @@ public static void DeleteVnetRoute(this IAppServicePlansOperations operations, s
             /// Delete a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Delete a Virtual Network route in an App Service plan.
+            /// Description for Delete a Virtual Network route in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1475,7 +1367,8 @@ public static void DeleteVnetRoute(this IAppServicePlansOperations operations, s
             /// Create or update a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Create or update a Virtual Network route in an App Service plan.
+            /// Description for Create or update a Virtual Network route in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1504,7 +1397,8 @@ public static VnetRoute UpdateVnetRoute(this IAppServicePlansOperations operatio
             /// Create or update a Virtual Network route in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Create or update a Virtual Network route in an App Service plan.
+            /// Description for Create or update a Virtual Network route in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1539,7 +1433,7 @@ public static VnetRoute UpdateVnetRoute(this IAppServicePlansOperations operatio
             /// Reboot a worker machine in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Reboot a worker machine in an App Service plan.
+            /// Description for Reboot a worker machine in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1562,7 +1456,7 @@ public static void RebootWorker(this IAppServicePlansOperations operations, stri
             /// Reboot a worker machine in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Reboot a worker machine in an App Service plan.
+            /// Description for Reboot a worker machine in an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1588,7 +1482,7 @@ public static void RebootWorker(this IAppServicePlansOperations operations, stri
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1611,7 +1505,7 @@ public static AppServicePlan BeginCreateOrUpdate(this IAppServicePlansOperations
             /// Creates or updates an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Creates or updates an App Service Plan.
+            /// Description for Creates or updates an App Service Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1640,7 +1534,7 @@ public static AppServicePlan BeginCreateOrUpdate(this IAppServicePlansOperations
             /// Get all App Service plans for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans for a subscription.
+            /// Description for Get all App Service plans for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1657,7 +1551,7 @@ public static IPage<AppServicePlan> ListNext(this IAppServicePlansOperations ope
             /// Get all App Service plans for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans for a subscription.
+            /// Description for Get all App Service plans for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1680,7 +1574,7 @@ public static IPage<AppServicePlan> ListNext(this IAppServicePlansOperations ope
             /// Get all App Service plans in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in a resource group.
+            /// Description for Get all App Service plans in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1697,7 +1591,7 @@ public static IPage<AppServicePlan> ListByResourceGroupNext(this IAppServicePlan
             /// Get all App Service plans in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all App Service plans in a resource group.
+            /// Description for Get all App Service plans in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1720,7 +1614,8 @@ public static IPage<AppServicePlan> ListByResourceGroupNext(this IAppServicePlan
             /// Get all apps that use a Hybrid Connection in an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps that use a Hybrid Connection in an App Service Plan.
+            /// Description for Get all apps that use a Hybrid Connection in an App Service
+            /// Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1737,7 +1632,8 @@ public static IPage<string> ListWebAppsByHybridConnectionNext(this IAppServicePl
             /// Get all apps that use a Hybrid Connection in an App Service Plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps that use a Hybrid Connection in an App Service Plan.
+            /// Description for Get all apps that use a Hybrid Connection in an App Service
+            /// Plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1760,7 +1656,8 @@ public static IPage<string> ListWebAppsByHybridConnectionNext(this IAppServicePl
             /// Retrieve all Hybrid Connections in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve all Hybrid Connections in use in an App Service plan.
+            /// Description for Retrieve all Hybrid Connections in use in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1777,7 +1674,8 @@ public static IPage<HybridConnection> ListHybridConnectionsNext(this IAppService
             /// Retrieve all Hybrid Connections in use in an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Retrieve all Hybrid Connections in use in an App Service plan.
+            /// Description for Retrieve all Hybrid Connections in use in an App Service
+            /// plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1796,95 +1694,11 @@ public static IPage<HybridConnection> ListHybridConnectionsNext(this IAppService
                 }
             }
 
-            /// <summary>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefintionsNext(this IAppServicePlansOperations operations, string nextPageLink)
-            {
-                return operations.ListMetricDefintionsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics that can be queried for an App Service plan, and their
-            /// definitions.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefintionsNextAsync(this IAppServicePlansOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricDefintionsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Get metrics for an App Service plan.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for an App Service plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetric> ListMetricsNext(this IAppServicePlansOperations operations, string nextPageLink)
-            {
-                return operations.ListMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get metrics for an App Service plan.
-            /// </summary>
-            /// <remarks>
-            /// Get metrics for an App Service plan.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsNextAsync(this IAppServicePlansOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Get all apps associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps associated with an App Service plan.
+            /// Description for Get all apps associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1901,7 +1715,7 @@ public static IPage<Site> ListWebAppsNext(this IAppServicePlansOperations operat
             /// Get all apps associated with an App Service plan.
             /// </summary>
             /// <remarks>
-            /// Get all apps associated with an App Service plan.
+            /// Description for Get all apps associated with an App Service plan.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1924,7 +1738,7 @@ public static IPage<Site> ListWebAppsNext(this IAppServicePlansOperations operat
             /// Gets server farm usage information
             /// </summary>
             /// <remarks>
-            /// Gets server farm usage information
+            /// Description for Gets server farm usage information
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1941,7 +1755,7 @@ public static IPage<CsmUsageQuota> ListUsagesNext(this IAppServicePlansOperation
             /// Gets server farm usage information
             /// </summary>
             /// <remarks>
-            /// Gets server farm usage information
+            /// Description for Gets server farm usage information
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperations.cs
index fb41fdec1685..5055da1d1c6e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperations.cs
@@ -55,8 +55,8 @@ internal CertificateRegistrationProviderOperations(WebSiteManagementClient clien
         /// under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm Apis
-        /// under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list of
+        /// available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -70,12 +70,21 @@ internal CertificateRegistrationProviderOperations(WebSiteManagementClient clien
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
         public async Task<AzureOperationResponse<IPage<CsmOperationDescription>>> ListOperationsWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -83,7 +92,6 @@ internal CertificateRegistrationProviderOperations(WebSiteManagementClient clien
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters);
             }
@@ -91,9 +99,9 @@ internal CertificateRegistrationProviderOperations(WebSiteManagementClient clien
             var _baseUrl = Client.BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.CertificateRegistration/operations").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -220,8 +228,8 @@ internal CertificateRegistrationProviderOperations(WebSiteManagementClient clien
         /// under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm Apis
-        /// under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list of
+        /// available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperationsExtensions.cs
index b62b054eb2b2..81c8ff391cdb 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificateRegistrationProviderOperationsExtensions.cs
@@ -26,8 +26,8 @@ public static partial class CertificateRegistrationProviderOperationsExtensions
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -42,8 +42,8 @@ public static IPage<CsmOperationDescription> ListOperations(this ICertificateReg
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -64,8 +64,8 @@ public static IPage<CsmOperationDescription> ListOperations(this ICertificateReg
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -83,8 +83,8 @@ public static IPage<CsmOperationDescription> ListOperationsNext(this ICertificat
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs
index d302eb926b8b..583856b5039f 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperations.cs
@@ -54,7 +54,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Get all certificates for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all certificates for a subscription.
+        /// Description for Get all certificates for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +83,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +94,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +102,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/certificates").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -228,7 +230,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Get all certificates in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all certificates in a resource group.
+        /// Description for Get all certificates in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -279,7 +281,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -288,7 +293,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -298,9 +302,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -426,7 +430,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Get a certificate.
         /// </summary>
         /// <remarks>
-        /// Get a certificate.
+        /// Description for Get a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -484,7 +488,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -494,7 +501,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -505,9 +511,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -633,7 +639,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Create or update a certificate.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate.
+        /// Description for Create or update a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -702,7 +708,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -713,7 +722,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("certificateEnvelope", certificateEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdate", tracingParameters);
             }
@@ -724,9 +732,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -858,7 +866,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Delete a certificate.
         /// </summary>
         /// <remarks>
-        /// Delete a certificate.
+        /// Description for Delete a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -872,7 +880,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -913,7 +921,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -923,7 +934,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters);
             }
@@ -934,9 +944,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -998,14 +1008,13 @@ internal CertificatesOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1015,10 +1024,6 @@ internal CertificatesOperations(WebSiteManagementClient 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);
@@ -1049,7 +1054,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Create or update a certificate.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate.
+        /// Description for Create or update a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1114,7 +1119,10 @@ internal CertificatesOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1125,7 +1133,6 @@ internal CertificatesOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("certificateEnvelope", certificateEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -1136,9 +1143,9 @@ internal CertificatesOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1270,7 +1277,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Get all certificates for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all certificates for a subscription.
+        /// Description for Get all certificates for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1441,7 +1448,7 @@ internal CertificatesOperations(WebSiteManagementClient client)
         /// Get all certificates in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all certificates in a resource group.
+        /// Description for Get all certificates in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs
index c6b8c9cf4707..2f310ccda8e3 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/CertificatesOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class CertificatesOperationsExtensions
             /// Get all certificates for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all certificates for a subscription.
+            /// Description for Get all certificates for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,7 +39,7 @@ public static IPage<Certificate> List(this ICertificatesOperations operations)
             /// Get all certificates for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all certificates for a subscription.
+            /// Description for Get all certificates for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -59,7 +59,7 @@ public static IPage<Certificate> List(this ICertificatesOperations operations)
             /// Get all certificates in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all certificates in a resource group.
+            /// Description for Get all certificates in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -76,7 +76,7 @@ public static IPage<Certificate> ListByResourceGroup(this ICertificatesOperation
             /// Get all certificates in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all certificates in a resource group.
+            /// Description for Get all certificates in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -99,7 +99,7 @@ public static IPage<Certificate> ListByResourceGroup(this ICertificatesOperation
             /// Get a certificate.
             /// </summary>
             /// <remarks>
-            /// Get a certificate.
+            /// Description for Get a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -119,7 +119,7 @@ public static Certificate Get(this ICertificatesOperations operations, string re
             /// Get a certificate.
             /// </summary>
             /// <remarks>
-            /// Get a certificate.
+            /// Description for Get a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -145,7 +145,7 @@ public static Certificate Get(this ICertificatesOperations operations, string re
             /// Create or update a certificate.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate.
+            /// Description for Create or update a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -168,7 +168,7 @@ public static Certificate CreateOrUpdate(this ICertificatesOperations operations
             /// Create or update a certificate.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate.
+            /// Description for Create or update a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -197,7 +197,7 @@ public static Certificate CreateOrUpdate(this ICertificatesOperations operations
             /// Delete a certificate.
             /// </summary>
             /// <remarks>
-            /// Delete a certificate.
+            /// Description for Delete a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -217,7 +217,7 @@ public static void Delete(this ICertificatesOperations operations, string resour
             /// Delete a certificate.
             /// </summary>
             /// <remarks>
-            /// Delete a certificate.
+            /// Description for Delete a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -240,7 +240,7 @@ public static void Delete(this ICertificatesOperations operations, string resour
             /// Create or update a certificate.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate.
+            /// Description for Create or update a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -263,7 +263,7 @@ public static Certificate Update(this ICertificatesOperations operations, string
             /// Create or update a certificate.
             /// </summary>
             /// <remarks>
-            /// Create or update a certificate.
+            /// Description for Create or update a certificate.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -292,7 +292,7 @@ public static Certificate Update(this ICertificatesOperations operations, string
             /// Get all certificates for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all certificates for a subscription.
+            /// Description for Get all certificates for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -309,7 +309,7 @@ public static IPage<Certificate> ListNext(this ICertificatesOperations operation
             /// Get all certificates for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all certificates for a subscription.
+            /// Description for Get all certificates for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -332,7 +332,7 @@ public static IPage<Certificate> ListNext(this ICertificatesOperations operation
             /// Get all certificates in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all certificates in a resource group.
+            /// Description for Get all certificates in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -349,7 +349,7 @@ public static IPage<Certificate> ListByResourceGroupNext(this ICertificatesOpera
             /// Get all certificates in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all certificates in a resource group.
+            /// Description for Get all certificates in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperations.cs
index bd33b2bc96c3..eaacc723b124 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperations.cs
@@ -54,7 +54,7 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
         /// Get all deleted apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription.
+        /// Description for Get all deleted apps for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +83,10 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +94,6 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +102,9 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/deletedSites").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -228,7 +230,7 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
         /// Get all deleted apps for a subscription at location
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription at location
+        /// Description for Get all deleted apps for a subscription at location
         /// </remarks>
         /// <param name='location'>
         /// </param>
@@ -263,7 +265,10 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -272,7 +277,6 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("location", location);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByLocation", tracingParameters);
             }
@@ -282,9 +286,9 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -410,7 +414,7 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
         /// Get deleted app for a subscription at location.
         /// </summary>
         /// <remarks>
-        /// Get deleted app for a subscription at location.
+        /// Description for Get deleted app for a subscription at location.
         /// </remarks>
         /// <param name='location'>
         /// </param>
@@ -452,7 +456,10 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -462,7 +469,6 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("location", location);
                 tracingParameters.Add("deletedSiteId", deletedSiteId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDeletedWebAppByLocation", tracingParameters);
             }
@@ -473,9 +479,9 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{deletedSiteId}", System.Uri.EscapeDataString(deletedSiteId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -601,7 +607,7 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
         /// Get all deleted apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription.
+        /// Description for Get all deleted apps for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -772,7 +778,7 @@ internal DeletedWebAppsOperations(WebSiteManagementClient client)
         /// Get all deleted apps for a subscription at location
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription at location
+        /// Description for Get all deleted apps for a subscription at location
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperationsExtensions.cs
index 018ffd807264..91d04f1bf961 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DeletedWebAppsOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class DeletedWebAppsOperationsExtensions
             /// Get all deleted apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription.
+            /// Description for Get all deleted apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,7 +39,7 @@ public static IPage<DeletedSite> List(this IDeletedWebAppsOperations operations)
             /// Get all deleted apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription.
+            /// Description for Get all deleted apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -59,7 +59,7 @@ public static IPage<DeletedSite> List(this IDeletedWebAppsOperations operations)
             /// Get all deleted apps for a subscription at location
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription at location
+            /// Description for Get all deleted apps for a subscription at location
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -75,7 +75,7 @@ public static IPage<DeletedSite> ListByLocation(this IDeletedWebAppsOperations o
             /// Get all deleted apps for a subscription at location
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription at location
+            /// Description for Get all deleted apps for a subscription at location
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -97,7 +97,7 @@ public static IPage<DeletedSite> ListByLocation(this IDeletedWebAppsOperations o
             /// Get deleted app for a subscription at location.
             /// </summary>
             /// <remarks>
-            /// Get deleted app for a subscription at location.
+            /// Description for Get deleted app for a subscription at location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -116,7 +116,7 @@ public static DeletedSite GetDeletedWebAppByLocation(this IDeletedWebAppsOperati
             /// Get deleted app for a subscription at location.
             /// </summary>
             /// <remarks>
-            /// Get deleted app for a subscription at location.
+            /// Description for Get deleted app for a subscription at location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -141,7 +141,7 @@ public static DeletedSite GetDeletedWebAppByLocation(this IDeletedWebAppsOperati
             /// Get all deleted apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription.
+            /// Description for Get all deleted apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -158,7 +158,7 @@ public static IPage<DeletedSite> ListNext(this IDeletedWebAppsOperations operati
             /// Get all deleted apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription.
+            /// Description for Get all deleted apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -181,7 +181,7 @@ public static IPage<DeletedSite> ListNext(this IDeletedWebAppsOperations operati
             /// Get all deleted apps for a subscription at location
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription at location
+            /// Description for Get all deleted apps for a subscription at location
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -198,7 +198,7 @@ public static IPage<DeletedSite> ListByLocationNext(this IDeletedWebAppsOperatio
             /// Get all deleted apps for a subscription at location
             /// </summary>
             /// <remarks>
-            /// Get all deleted apps for a subscription at location
+            /// Description for Get all deleted apps for a subscription at location
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs
index 5cce7a909867..bdcc7b0ef1c5 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperations.cs
@@ -54,7 +54,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// List Hosting Environment Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Hosting Environment Detector Responses
+        /// Description for List Hosting Environment Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -112,7 +112,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -122,7 +125,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHostingEnvironmentDetectorResponses", tracingParameters);
             }
@@ -133,9 +135,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -261,7 +263,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Hosting Environment Detector Response
         /// </summary>
         /// <remarks>
-        /// Get Hosting Environment Detector Response
+        /// Description for Get Hosting Environment Detector Response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -342,7 +344,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -356,7 +361,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHostingEnvironmentDetectorResponse", tracingParameters);
             }
@@ -380,9 +384,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -508,7 +512,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -566,7 +570,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -576,7 +583,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDetectorResponses", tracingParameters);
             }
@@ -587,9 +593,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteName}", System.Uri.EscapeDataString(siteName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -715,7 +721,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get site detector response
         /// </summary>
         /// <remarks>
-        /// Get site detector response
+        /// Description for Get site detector response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -796,7 +802,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -810,7 +819,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetectorResponse", tracingParameters);
             }
@@ -834,9 +842,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -962,7 +970,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1020,7 +1028,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1030,7 +1041,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDiagnosticCategories", tracingParameters);
             }
@@ -1041,9 +1051,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteName}", System.Uri.EscapeDataString(siteName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1169,7 +1179,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Category
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Category
+        /// Description for Get Diagnostics Category
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1234,7 +1244,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1245,7 +1258,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDiagnosticCategory", tracingParameters);
             }
@@ -1257,9 +1269,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{diagnosticCategory}", System.Uri.EscapeDataString(diagnosticCategory));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1385,7 +1397,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1450,7 +1462,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1461,7 +1476,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteAnalyses", tracingParameters);
             }
@@ -1473,9 +1487,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{diagnosticCategory}", System.Uri.EscapeDataString(diagnosticCategory));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1601,7 +1615,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analysis
         /// </summary>
         /// <remarks>
-        /// Get Site Analysis
+        /// Description for Get Site Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1636,7 +1650,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<DiagnosticAnalysis>> GetSiteAnalysisWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AnalysisDefinition>> GetSiteAnalysisWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -1673,7 +1687,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1685,7 +1702,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("analysisName", analysisName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteAnalysis", tracingParameters);
             }
@@ -1698,9 +1714,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{analysisName}", System.Uri.EscapeDataString(analysisName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1790,7 +1806,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<DiagnosticAnalysis>();
+            var _result = new AzureOperationResponse<AnalysisDefinition>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1803,7 +1819,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DiagnosticAnalysis>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AnalysisDefinition>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1826,7 +1842,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Execute Analysis
         /// </summary>
         /// <remarks>
-        /// Execute Analysis
+        /// Description for Execute Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1914,7 +1930,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1929,7 +1948,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ExecuteSiteAnalysis", tracingParameters);
             }
@@ -1954,9 +1972,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2082,7 +2100,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2147,7 +2165,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2158,7 +2179,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDetectors", tracingParameters);
             }
@@ -2170,9 +2190,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{diagnosticCategory}", System.Uri.EscapeDataString(diagnosticCategory));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2298,7 +2318,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detector
         /// </summary>
         /// <remarks>
-        /// Get Detector
+        /// Description for Get Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2333,7 +2353,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DetectorDefinition>> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -2370,7 +2390,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2382,7 +2405,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("detectorName", detectorName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetector", tracingParameters);
             }
@@ -2395,9 +2417,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{detectorName}", System.Uri.EscapeDataString(detectorName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2487,7 +2509,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<DetectorDefinition>>();
+            var _result = new AzureOperationResponse<DetectorDefinition>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2500,7 +2522,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<DetectorDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DetectorDefinition>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2523,7 +2545,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Execute Detector
         /// </summary>
         /// <remarks>
-        /// Execute Detector
+        /// Description for Execute Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2611,7 +2633,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2626,7 +2651,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ExecuteSiteDetector", tracingParameters);
             }
@@ -2651,9 +2675,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2779,7 +2803,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2844,7 +2868,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2855,7 +2882,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDetectorResponsesSlot", tracingParameters);
             }
@@ -2867,9 +2893,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2995,7 +3021,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get site detector response
         /// </summary>
         /// <remarks>
-        /// Get site detector response
+        /// Description for Get site detector response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3083,7 +3109,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3098,7 +3127,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetectorResponseSlot", tracingParameters);
             }
@@ -3123,9 +3151,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3251,7 +3279,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3316,7 +3344,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3327,7 +3358,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDiagnosticCategoriesSlot", tracingParameters);
             }
@@ -3339,9 +3369,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3467,7 +3497,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Category
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Category
+        /// Description for Get Diagnostics Category
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3539,7 +3569,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3551,7 +3584,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDiagnosticCategorySlot", tracingParameters);
             }
@@ -3564,9 +3596,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3692,7 +3724,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3764,7 +3796,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3776,7 +3811,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteAnalysesSlot", tracingParameters);
             }
@@ -3789,9 +3823,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3917,7 +3951,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analysis
         /// </summary>
         /// <remarks>
-        /// Get Site Analysis
+        /// Description for Get Site Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3955,7 +3989,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<DiagnosticAnalysis>> GetSiteAnalysisSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AnalysisDefinition>> GetSiteAnalysisSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -3996,7 +4030,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4009,7 +4046,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("analysisName", analysisName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteAnalysisSlot", tracingParameters);
             }
@@ -4023,9 +4059,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4115,7 +4151,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<DiagnosticAnalysis>();
+            var _result = new AzureOperationResponse<AnalysisDefinition>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4128,7 +4164,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DiagnosticAnalysis>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AnalysisDefinition>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4151,7 +4187,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Execute Analysis
         /// </summary>
         /// <remarks>
-        /// Execute Analysis
+        /// Description for Execute Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4246,7 +4282,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4262,7 +4301,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ExecuteSiteAnalysisSlot", tracingParameters);
             }
@@ -4288,9 +4326,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4416,7 +4454,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4488,7 +4526,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4500,7 +4541,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteDetectorsSlot", tracingParameters);
             }
@@ -4513,9 +4553,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4641,7 +4681,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detector
         /// </summary>
         /// <remarks>
-        /// Get Detector
+        /// Description for Get Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4679,7 +4719,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DetectorDefinition>> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4720,7 +4760,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4733,7 +4776,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("diagnosticCategory", diagnosticCategory);
                 tracingParameters.Add("detectorName", detectorName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetectorSlot", tracingParameters);
             }
@@ -4747,9 +4789,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4839,7 +4881,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<DetectorDefinition>>();
+            var _result = new AzureOperationResponse<DetectorDefinition>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4852,7 +4894,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<DetectorDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DetectorDefinition>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -4875,7 +4917,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Execute Detector
         /// </summary>
         /// <remarks>
-        /// Execute Detector
+        /// Description for Execute Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4970,7 +5012,10 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4986,7 +5031,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("startTime", startTime);
                 tracingParameters.Add("endTime", endTime);
                 tracingParameters.Add("timeGrain", timeGrain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ExecuteSiteDetectorSlot", tracingParameters);
             }
@@ -5012,9 +5056,9 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("timeGrain={0}", System.Uri.EscapeDataString(timeGrain)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5140,7 +5184,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// List Hosting Environment Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Hosting Environment Detector Responses
+        /// Description for List Hosting Environment Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -5311,7 +5355,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -5482,7 +5526,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -5653,7 +5697,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -5824,7 +5868,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -5991,182 +6035,11 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             return _result;
         }
 
-        /// <summary>
-        /// Get Detector
-        /// </summary>
-        /// <remarks>
-        /// Get Detector
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetectorNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<DetectorDefinition>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<DetectorDefinition>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
         /// <summary>
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6337,7 +6210,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6508,7 +6381,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6679,7 +6552,7 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -6750,177 +6623,6 @@ internal DiagnosticsOperations(WebSiteManagementClient client)
             }
 
 
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<DetectorDefinition>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<DetectorDefinition>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get Detector
-        /// </summary>
-        /// <remarks>
-        /// Get Detector
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetSiteDetectorSlotNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
             if (customHeaders != null)
             {
                 foreach(var _header in customHeaders)
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs
index e342552aef2c..7cfac6fdb1b8 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DiagnosticsOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class DiagnosticsOperationsExtensions
             /// List Hosting Environment Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Hosting Environment Detector Responses
+            /// Description for List Hosting Environment Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -45,7 +45,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponses(th
             /// List Hosting Environment Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Hosting Environment Detector Responses
+            /// Description for List Hosting Environment Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -71,7 +71,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponses(th
             /// Get Hosting Environment Detector Response
             /// </summary>
             /// <remarks>
-            /// Get Hosting Environment Detector Response
+            /// Description for Get Hosting Environment Detector Response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -103,7 +103,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponses(th
             /// Get Hosting Environment Detector Response
             /// </summary>
             /// <remarks>
-            /// Get Hosting Environment Detector Response
+            /// Description for Get Hosting Environment Detector Response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -141,7 +141,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponses(th
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -161,7 +161,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponses(this IDiagnostic
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -187,7 +187,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponses(this IDiagnostic
             /// Get site detector response
             /// </summary>
             /// <remarks>
-            /// Get site detector response
+            /// Description for Get site detector response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -219,7 +219,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponses(this IDiagnostic
             /// Get site detector response
             /// </summary>
             /// <remarks>
-            /// Get site detector response
+            /// Description for Get site detector response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -257,7 +257,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponses(this IDiagnostic
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -277,7 +277,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategories(this IDiagn
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -303,7 +303,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategories(this IDiagn
             /// Get Diagnostics Category
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Category
+            /// Description for Get Diagnostics Category
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -326,7 +326,7 @@ public static DiagnosticCategory GetSiteDiagnosticCategory(this IDiagnosticsOper
             /// Get Diagnostics Category
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Category
+            /// Description for Get Diagnostics Category
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -355,7 +355,7 @@ public static DiagnosticCategory GetSiteDiagnosticCategory(this IDiagnosticsOper
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -378,7 +378,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalyses(this IDiagnosticsOperat
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -407,7 +407,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalyses(this IDiagnosticsOperat
             /// Get Site Analysis
             /// </summary>
             /// <remarks>
-            /// Get Site Analysis
+            /// Description for Get Site Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -424,7 +424,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalyses(this IDiagnosticsOperat
             /// <param name='analysisName'>
             /// Analysis Name
             /// </param>
-            public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName)
+            public static AnalysisDefinition GetSiteAnalysis(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName)
             {
                 return operations.GetSiteAnalysisAsync(resourceGroupName, siteName, diagnosticCategory, analysisName).GetAwaiter().GetResult();
             }
@@ -433,7 +433,7 @@ public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations ope
             /// Get Site Analysis
             /// </summary>
             /// <remarks>
-            /// Get Site Analysis
+            /// Description for Get Site Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -453,7 +453,7 @@ public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations ope
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<DiagnosticAnalysis> GetSiteAnalysisAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<AnalysisDefinition> GetSiteAnalysisAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetSiteAnalysisWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -465,7 +465,7 @@ public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations ope
             /// Execute Analysis
             /// </summary>
             /// <remarks>
-            /// Execute Analysis
+            /// Description for Execute Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -500,7 +500,7 @@ public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations ope
             /// Execute Analysis
             /// </summary>
             /// <remarks>
-            /// Execute Analysis
+            /// Description for Execute Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -541,7 +541,7 @@ public static DiagnosticAnalysis GetSiteAnalysis(this IDiagnosticsOperations ope
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -564,7 +564,7 @@ public static IPage<DetectorDefinition> ListSiteDetectors(this IDiagnosticsOpera
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -593,7 +593,7 @@ public static IPage<DetectorDefinition> ListSiteDetectors(this IDiagnosticsOpera
             /// Get Detector
             /// </summary>
             /// <remarks>
-            /// Get Detector
+            /// Description for Get Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -610,7 +610,7 @@ public static IPage<DetectorDefinition> ListSiteDetectors(this IDiagnosticsOpera
             /// <param name='detectorName'>
             /// Detector Name
             /// </param>
-            public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName)
+            public static DetectorDefinition GetSiteDetector(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName)
             {
                 return operations.GetSiteDetectorAsync(resourceGroupName, siteName, diagnosticCategory, detectorName).GetAwaiter().GetResult();
             }
@@ -619,7 +619,7 @@ public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperati
             /// Get Detector
             /// </summary>
             /// <remarks>
-            /// Get Detector
+            /// Description for Get Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -639,7 +639,7 @@ public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperati
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<DetectorDefinition>> GetSiteDetectorAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DetectorDefinition> GetSiteDetectorAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetSiteDetectorWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -651,7 +651,7 @@ public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperati
             /// Execute Detector
             /// </summary>
             /// <remarks>
-            /// Execute Detector
+            /// Description for Execute Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -686,7 +686,7 @@ public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperati
             /// Execute Detector
             /// </summary>
             /// <remarks>
-            /// Execute Detector
+            /// Description for Execute Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -727,7 +727,7 @@ public static IPage<DetectorDefinition> GetSiteDetector(this IDiagnosticsOperati
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -750,7 +750,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlot(this IDiagno
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -779,7 +779,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlot(this IDiagno
             /// Get site detector response
             /// </summary>
             /// <remarks>
-            /// Get site detector response
+            /// Description for Get site detector response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -814,7 +814,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlot(this IDiagno
             /// Get site detector response
             /// </summary>
             /// <remarks>
-            /// Get site detector response
+            /// Description for Get site detector response
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -855,7 +855,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlot(this IDiagno
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -878,7 +878,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesSlot(this ID
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -907,7 +907,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesSlot(this ID
             /// Get Diagnostics Category
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Category
+            /// Description for Get Diagnostics Category
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -933,7 +933,7 @@ public static DiagnosticCategory GetSiteDiagnosticCategorySlot(this IDiagnostics
             /// Get Diagnostics Category
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Category
+            /// Description for Get Diagnostics Category
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -965,7 +965,7 @@ public static DiagnosticCategory GetSiteDiagnosticCategorySlot(this IDiagnostics
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -991,7 +991,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesSlot(this IDiagnosticsOp
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1023,7 +1023,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesSlot(this IDiagnosticsOp
             /// Get Site Analysis
             /// </summary>
             /// <remarks>
-            /// Get Site Analysis
+            /// Description for Get Site Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1043,7 +1043,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesSlot(this IDiagnosticsOp
             /// <param name='slot'>
             /// Slot - optional
             /// </param>
-            public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot)
+            public static AnalysisDefinition GetSiteAnalysisSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot)
             {
                 return operations.GetSiteAnalysisSlotAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot).GetAwaiter().GetResult();
             }
@@ -1052,7 +1052,7 @@ public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations
             /// Get Site Analysis
             /// </summary>
             /// <remarks>
-            /// Get Site Analysis
+            /// Description for Get Site Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1075,7 +1075,7 @@ public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<DiagnosticAnalysis> GetSiteAnalysisSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<AnalysisDefinition> GetSiteAnalysisSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetSiteAnalysisSlotWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, analysisName, slot, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -1087,7 +1087,7 @@ public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations
             /// Execute Analysis
             /// </summary>
             /// <remarks>
-            /// Execute Analysis
+            /// Description for Execute Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1125,7 +1125,7 @@ public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations
             /// Execute Analysis
             /// </summary>
             /// <remarks>
-            /// Execute Analysis
+            /// Description for Execute Analysis
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1169,7 +1169,7 @@ public static DiagnosticAnalysis GetSiteAnalysisSlot(this IDiagnosticsOperations
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1195,7 +1195,7 @@ public static IPage<DetectorDefinition> ListSiteDetectorsSlot(this IDiagnosticsO
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1227,7 +1227,7 @@ public static IPage<DetectorDefinition> ListSiteDetectorsSlot(this IDiagnosticsO
             /// Get Detector
             /// </summary>
             /// <remarks>
-            /// Get Detector
+            /// Description for Get Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1247,7 +1247,7 @@ public static IPage<DetectorDefinition> ListSiteDetectorsSlot(this IDiagnosticsO
             /// <param name='slot'>
             /// Slot Name
             /// </param>
-            public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot)
+            public static DetectorDefinition GetSiteDetectorSlot(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot)
             {
                 return operations.GetSiteDetectorSlotAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, slot).GetAwaiter().GetResult();
             }
@@ -1256,7 +1256,7 @@ public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOpe
             /// Get Detector
             /// </summary>
             /// <remarks>
-            /// Get Detector
+            /// Description for Get Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1279,7 +1279,7 @@ public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOpe
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<DetectorDefinition>> GetSiteDetectorSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DetectorDefinition> GetSiteDetectorSlotAsync(this IDiagnosticsOperations operations, string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetSiteDetectorSlotWithHttpMessagesAsync(resourceGroupName, siteName, diagnosticCategory, detectorName, slot, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -1291,7 +1291,7 @@ public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOpe
             /// Execute Detector
             /// </summary>
             /// <remarks>
-            /// Execute Detector
+            /// Description for Execute Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1329,7 +1329,7 @@ public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOpe
             /// Execute Detector
             /// </summary>
             /// <remarks>
-            /// Execute Detector
+            /// Description for Execute Detector
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1373,7 +1373,7 @@ public static IPage<DetectorDefinition> GetSiteDetectorSlot(this IDiagnosticsOpe
             /// List Hosting Environment Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Hosting Environment Detector Responses
+            /// Description for List Hosting Environment Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1390,7 +1390,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponsesNex
             /// List Hosting Environment Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Hosting Environment Detector Responses
+            /// Description for List Hosting Environment Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1413,7 +1413,7 @@ public static IPage<DetectorResponse> ListHostingEnvironmentDetectorResponsesNex
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1430,7 +1430,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesNext(this IDiagno
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1453,7 +1453,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesNext(this IDiagno
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1470,7 +1470,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesNext(this ID
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1493,7 +1493,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesNext(this ID
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1510,7 +1510,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesNext(this IDiagnosticsOp
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1533,7 +1533,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesNext(this IDiagnosticsOp
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1550,7 +1550,7 @@ public static IPage<DetectorDefinition> ListSiteDetectorsNext(this IDiagnosticsO
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1569,51 +1569,11 @@ public static IPage<DetectorDefinition> ListSiteDetectorsNext(this IDiagnosticsO
                 }
             }
 
-            /// <summary>
-            /// Get Detector
-            /// </summary>
-            /// <remarks>
-            /// Get Detector
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<DetectorDefinition> GetSiteDetectorNext(this IDiagnosticsOperations operations, string nextPageLink)
-            {
-                return operations.GetSiteDetectorNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get Detector
-            /// </summary>
-            /// <remarks>
-            /// Get Detector
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<DetectorDefinition>> GetSiteDetectorNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.GetSiteDetectorNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1630,7 +1590,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlotNext(this IDi
             /// List Site Detector Responses
             /// </summary>
             /// <remarks>
-            /// List Site Detector Responses
+            /// Description for List Site Detector Responses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1653,7 +1613,7 @@ public static IPage<DetectorResponse> ListSiteDetectorResponsesSlotNext(this IDi
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1670,7 +1630,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesSlotNext(thi
             /// Get Diagnostics Categories
             /// </summary>
             /// <remarks>
-            /// Get Diagnostics Categories
+            /// Description for Get Diagnostics Categories
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1693,7 +1653,7 @@ public static IPage<DiagnosticCategory> ListSiteDiagnosticCategoriesSlotNext(thi
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1710,7 +1670,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesSlotNext(this IDiagnosti
             /// Get Site Analyses
             /// </summary>
             /// <remarks>
-            /// Get Site Analyses
+            /// Description for Get Site Analyses
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1733,7 +1693,7 @@ public static IPage<AnalysisDefinition> ListSiteAnalysesSlotNext(this IDiagnosti
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1750,7 +1710,7 @@ public static IPage<DetectorDefinition> ListSiteDetectorsSlotNext(this IDiagnost
             /// Get Detectors
             /// </summary>
             /// <remarks>
-            /// Get Detectors
+            /// Description for Get Detectors
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1769,45 +1729,5 @@ public static IPage<DetectorDefinition> ListSiteDetectorsSlotNext(this IDiagnost
                 }
             }
 
-            /// <summary>
-            /// Get Detector
-            /// </summary>
-            /// <remarks>
-            /// Get Detector
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<DetectorDefinition> GetSiteDetectorSlotNext(this IDiagnosticsOperations operations, string nextPageLink)
-            {
-                return operations.GetSiteDetectorSlotNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get Detector
-            /// </summary>
-            /// <remarks>
-            /// Get Detector
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<DetectorDefinition>> GetSiteDetectorSlotNextAsync(this IDiagnosticsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.GetSiteDetectorSlotNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperations.cs
index 2ae901e137e1..9a7c4a60ffde 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperations.cs
@@ -55,8 +55,8 @@ internal DomainRegistrationProviderOperations(WebSiteManagementClient client)
         /// under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm Apis
-        /// under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list of
+        /// available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -70,12 +70,21 @@ internal DomainRegistrationProviderOperations(WebSiteManagementClient client)
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
         public async Task<AzureOperationResponse<IPage<CsmOperationDescription>>> ListOperationsWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -83,7 +92,6 @@ internal DomainRegistrationProviderOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters);
             }
@@ -91,9 +99,9 @@ internal DomainRegistrationProviderOperations(WebSiteManagementClient client)
             var _baseUrl = Client.BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.DomainRegistration/operations").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -220,8 +228,8 @@ internal DomainRegistrationProviderOperations(WebSiteManagementClient client)
         /// under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm Apis
-        /// under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list of
+        /// available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperationsExtensions.cs
index 74408e12c493..65da5aafe823 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainRegistrationProviderOperationsExtensions.cs
@@ -26,8 +26,8 @@ public static partial class DomainRegistrationProviderOperationsExtensions
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -42,8 +42,8 @@ public static IPage<CsmOperationDescription> ListOperations(this IDomainRegistra
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -64,8 +64,8 @@ public static IPage<CsmOperationDescription> ListOperations(this IDomainRegistra
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -83,8 +83,8 @@ public static IPage<CsmOperationDescription> ListOperationsNext(this IDomainRegi
             /// under the resource provider
             /// </summary>
             /// <remarks>
-            /// Implements Csm operations Api to exposes the list of available Csm Apis
-            /// under the resource provider
+            /// Description for Implements Csm operations Api to exposes the list of
+            /// available Csm Apis under the resource provider
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperations.cs
index 829bbe2da55c..32d276db9b8f 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperations.cs
@@ -54,7 +54,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Check if a domain is available for registration.
         /// </summary>
         /// <remarks>
-        /// Check if a domain is available for registration.
+        /// Description for Check if a domain is available for registration.
         /// </remarks>
         /// <param name='identifier'>
         /// Name of the domain.
@@ -80,7 +80,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<DomainAvailablilityCheckResult>> CheckAvailabilityWithHttpMessagesAsync(NameIdentifier identifier, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<DomainAvailabilityCheckResult>> CheckAvailabilityWithHttpMessagesAsync(NameIdentifier identifier, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (identifier == null)
             {
@@ -90,7 +90,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -99,7 +102,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("identifier", identifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CheckAvailability", tracingParameters);
             }
@@ -108,9 +110,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/checkDomainAvailability").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -206,7 +208,7 @@ internal DomainsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<DomainAvailablilityCheckResult>();
+            var _result = new AzureOperationResponse<DomainAvailabilityCheckResult>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -219,7 +221,7 @@ internal DomainsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DomainAvailablilityCheckResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<DomainAvailabilityCheckResult>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -242,7 +244,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get all domains in a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a subscription.
+        /// Description for Get all domains in a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -271,7 +273,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -279,7 +284,6 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -288,9 +292,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/domains").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -416,7 +420,8 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Generate a single sign-on request for the domain management portal.
         /// </summary>
         /// <remarks>
-        /// Generate a single sign-on request for the domain management portal.
+        /// Description for Generate a single sign-on request for the domain management
+        /// portal.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -445,7 +450,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -453,7 +461,6 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetControlCenterSsoRequest", tracingParameters);
             }
@@ -462,9 +469,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/generateSsoRequest").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -590,7 +597,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get domain name recommendations based on keywords.
         /// </summary>
         /// <remarks>
-        /// Get domain name recommendations based on keywords.
+        /// Description for Get domain name recommendations based on keywords.
         /// </remarks>
         /// <param name='parameters'>
         /// Search parameters for domain name recommendations.
@@ -626,7 +633,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -635,7 +645,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("parameters", parameters);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListRecommendations", tracingParameters);
             }
@@ -644,9 +653,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/listDomainRecommendations").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -778,7 +787,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get all domains in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a resource group.
+        /// Description for Get all domains in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -829,7 +838,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -838,7 +850,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -848,9 +859,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -976,7 +987,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get a domain.
         /// </summary>
         /// <remarks>
-        /// Get a domain.
+        /// Description for Get a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1034,7 +1045,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1044,7 +1058,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -1055,9 +1068,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainName}", System.Uri.EscapeDataString(domainName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1183,7 +1196,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1211,7 +1224,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Delete a domain.
         /// </summary>
         /// <remarks>
-        /// Delete a domain.
+        /// Description for Delete a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1230,7 +1243,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1271,7 +1284,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1282,7 +1298,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("forceHardDeleteDomain", forceHardDeleteDomain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters);
             }
@@ -1297,9 +1312,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("forceHardDeleteDomain={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(forceHardDeleteDomain, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1361,14 +1376,13 @@ internal DomainsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1378,10 +1392,6 @@ internal DomainsOperations(WebSiteManagementClient 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);
@@ -1412,7 +1422,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1484,7 +1494,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1495,7 +1508,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("domain", domain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -1506,9 +1518,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainName}", System.Uri.EscapeDataString(domainName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1658,7 +1670,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Lists domain ownership identifiers.
         /// </summary>
         /// <remarks>
-        /// Lists domain ownership identifiers.
+        /// Description for Lists domain ownership identifiers.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1716,7 +1728,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1726,7 +1741,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListOwnershipIdentifiers", tracingParameters);
             }
@@ -1737,9 +1751,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainName}", System.Uri.EscapeDataString(domainName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1865,7 +1879,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get ownership identifier for domain
         /// </summary>
         /// <remarks>
-        /// Get ownership identifier for domain
+        /// Description for Get ownership identifier for domain
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1930,7 +1944,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1941,7 +1958,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetOwnershipIdentifier", tracingParameters);
             }
@@ -1953,9 +1969,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2082,8 +2098,8 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// for an existing identifer
         /// </summary>
         /// <remarks>
-        /// Creates an ownership identifier for a domain or updates identifier details
-        /// for an existing identifer
+        /// Description for Creates an ownership identifier for a domain or updates
+        /// identifier details for an existing identifer
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2155,7 +2171,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2167,7 +2186,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateOwnershipIdentifier", tracingParameters);
             }
@@ -2179,9 +2197,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2313,7 +2331,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Delete ownership identifier for domain
         /// </summary>
         /// <remarks>
-        /// Delete ownership identifier for domain
+        /// Description for Delete ownership identifier for domain
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2330,7 +2348,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2375,7 +2393,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2386,7 +2407,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteOwnershipIdentifier", tracingParameters);
             }
@@ -2398,9 +2418,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2462,14 +2482,13 @@ internal DomainsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2479,10 +2498,6 @@ internal DomainsOperations(WebSiteManagementClient 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);
@@ -2514,8 +2529,8 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// for an existing identifer
         /// </summary>
         /// <remarks>
-        /// Creates an ownership identifier for a domain or updates identifier details
-        /// for an existing identifer
+        /// Description for Creates an ownership identifier for a domain or updates
+        /// identifier details for an existing identifer
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2587,7 +2602,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2599,7 +2617,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateOwnershipIdentifier", tracingParameters);
             }
@@ -2611,9 +2628,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2745,7 +2762,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Renew a domain.
         /// </summary>
         /// <remarks>
-        /// Renew a domain.
+        /// Description for Renew a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2759,7 +2776,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2800,7 +2817,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2810,7 +2830,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Renew", tracingParameters);
             }
@@ -2821,9 +2840,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainName}", System.Uri.EscapeDataString(domainName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2883,16 +2902,15 @@ internal DomainsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 204 && (int)_statusCode != 400 && (int)_statusCode != 500)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2902,10 +2920,6 @@ internal DomainsOperations(WebSiteManagementClient 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);
@@ -2936,7 +2950,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3012,7 +3026,10 @@ internal DomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3023,7 +3040,6 @@ internal DomainsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("domainName", domainName);
                 tracingParameters.Add("domain", domain);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
             }
@@ -3034,9 +3050,9 @@ internal DomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainName}", System.Uri.EscapeDataString(domainName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3186,7 +3202,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get all domains in a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a subscription.
+        /// Description for Get all domains in a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3357,7 +3373,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get domain name recommendations based on keywords.
         /// </summary>
         /// <remarks>
-        /// Get domain name recommendations based on keywords.
+        /// Description for Get domain name recommendations based on keywords.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3528,7 +3544,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Get all domains in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a resource group.
+        /// Description for Get all domains in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3699,7 +3715,7 @@ internal DomainsOperations(WebSiteManagementClient client)
         /// Lists domain ownership identifiers.
         /// </summary>
         /// <remarks>
-        /// Lists domain ownership identifiers.
+        /// Description for Lists domain ownership identifiers.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperationsExtensions.cs
index 61dce641ad89..d6580c16cf14 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/DomainsOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class DomainsOperationsExtensions
             /// Check if a domain is available for registration.
             /// </summary>
             /// <remarks>
-            /// Check if a domain is available for registration.
+            /// Description for Check if a domain is available for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -33,7 +33,7 @@ public static partial class DomainsOperationsExtensions
             /// <param name='identifier'>
             /// Name of the domain.
             /// </param>
-            public static DomainAvailablilityCheckResult CheckAvailability(this IDomainsOperations operations, NameIdentifier identifier)
+            public static DomainAvailabilityCheckResult CheckAvailability(this IDomainsOperations operations, NameIdentifier identifier)
             {
                 return operations.CheckAvailabilityAsync(identifier).GetAwaiter().GetResult();
             }
@@ -42,7 +42,7 @@ public static DomainAvailablilityCheckResult CheckAvailability(this IDomainsOper
             /// Check if a domain is available for registration.
             /// </summary>
             /// <remarks>
-            /// Check if a domain is available for registration.
+            /// Description for Check if a domain is available for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -53,7 +53,7 @@ public static DomainAvailablilityCheckResult CheckAvailability(this IDomainsOper
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<DomainAvailablilityCheckResult> CheckAvailabilityAsync(this IDomainsOperations operations, NameIdentifier identifier, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<DomainAvailabilityCheckResult> CheckAvailabilityAsync(this IDomainsOperations operations, NameIdentifier identifier, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.CheckAvailabilityWithHttpMessagesAsync(identifier, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -65,7 +65,7 @@ public static DomainAvailablilityCheckResult CheckAvailability(this IDomainsOper
             /// Get all domains in a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a subscription.
+            /// Description for Get all domains in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -79,7 +79,7 @@ public static IPage<Domain> List(this IDomainsOperations operations)
             /// Get all domains in a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a subscription.
+            /// Description for Get all domains in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -99,7 +99,8 @@ public static IPage<Domain> List(this IDomainsOperations operations)
             /// Generate a single sign-on request for the domain management portal.
             /// </summary>
             /// <remarks>
-            /// Generate a single sign-on request for the domain management portal.
+            /// Description for Generate a single sign-on request for the domain management
+            /// portal.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -113,7 +114,8 @@ public static DomainControlCenterSsoRequest GetControlCenterSsoRequest(this IDom
             /// Generate a single sign-on request for the domain management portal.
             /// </summary>
             /// <remarks>
-            /// Generate a single sign-on request for the domain management portal.
+            /// Description for Generate a single sign-on request for the domain management
+            /// portal.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -133,7 +135,7 @@ public static DomainControlCenterSsoRequest GetControlCenterSsoRequest(this IDom
             /// Get domain name recommendations based on keywords.
             /// </summary>
             /// <remarks>
-            /// Get domain name recommendations based on keywords.
+            /// Description for Get domain name recommendations based on keywords.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -150,7 +152,7 @@ public static IPage<NameIdentifier> ListRecommendations(this IDomainsOperations
             /// Get domain name recommendations based on keywords.
             /// </summary>
             /// <remarks>
-            /// Get domain name recommendations based on keywords.
+            /// Description for Get domain name recommendations based on keywords.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -173,7 +175,7 @@ public static IPage<NameIdentifier> ListRecommendations(this IDomainsOperations
             /// Get all domains in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a resource group.
+            /// Description for Get all domains in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -190,7 +192,7 @@ public static IPage<Domain> ListByResourceGroup(this IDomainsOperations operatio
             /// Get all domains in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a resource group.
+            /// Description for Get all domains in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -213,7 +215,7 @@ public static IPage<Domain> ListByResourceGroup(this IDomainsOperations operatio
             /// Get a domain.
             /// </summary>
             /// <remarks>
-            /// Get a domain.
+            /// Description for Get a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -233,7 +235,7 @@ public static Domain Get(this IDomainsOperations operations, string resourceGrou
             /// Get a domain.
             /// </summary>
             /// <remarks>
-            /// Get a domain.
+            /// Description for Get a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -259,7 +261,7 @@ public static Domain Get(this IDomainsOperations operations, string resourceGrou
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -282,7 +284,7 @@ public static Domain CreateOrUpdate(this IDomainsOperations operations, string r
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -311,7 +313,7 @@ public static Domain CreateOrUpdate(this IDomainsOperations operations, string r
             /// Delete a domain.
             /// </summary>
             /// <remarks>
-            /// Delete a domain.
+            /// Description for Delete a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -336,7 +338,7 @@ public static Domain CreateOrUpdate(this IDomainsOperations operations, string r
             /// Delete a domain.
             /// </summary>
             /// <remarks>
-            /// Delete a domain.
+            /// Description for Delete a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -364,7 +366,7 @@ public static Domain CreateOrUpdate(this IDomainsOperations operations, string r
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -387,7 +389,7 @@ public static Domain Update(this IDomainsOperations operations, string resourceG
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -416,7 +418,7 @@ public static Domain Update(this IDomainsOperations operations, string resourceG
             /// Lists domain ownership identifiers.
             /// </summary>
             /// <remarks>
-            /// Lists domain ownership identifiers.
+            /// Description for Lists domain ownership identifiers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -436,7 +438,7 @@ public static IPage<DomainOwnershipIdentifier> ListOwnershipIdentifiers(this IDo
             /// Lists domain ownership identifiers.
             /// </summary>
             /// <remarks>
-            /// Lists domain ownership identifiers.
+            /// Description for Lists domain ownership identifiers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -462,7 +464,7 @@ public static IPage<DomainOwnershipIdentifier> ListOwnershipIdentifiers(this IDo
             /// Get ownership identifier for domain
             /// </summary>
             /// <remarks>
-            /// Get ownership identifier for domain
+            /// Description for Get ownership identifier for domain
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -485,7 +487,7 @@ public static DomainOwnershipIdentifier GetOwnershipIdentifier(this IDomainsOper
             /// Get ownership identifier for domain
             /// </summary>
             /// <remarks>
-            /// Get ownership identifier for domain
+            /// Description for Get ownership identifier for domain
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -515,8 +517,8 @@ public static DomainOwnershipIdentifier GetOwnershipIdentifier(this IDomainsOper
             /// for an existing identifer
             /// </summary>
             /// <remarks>
-            /// Creates an ownership identifier for a domain or updates identifier details
-            /// for an existing identifer
+            /// Description for Creates an ownership identifier for a domain or updates
+            /// identifier details for an existing identifer
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -543,8 +545,8 @@ public static DomainOwnershipIdentifier CreateOrUpdateOwnershipIdentifier(this I
             /// for an existing identifer
             /// </summary>
             /// <remarks>
-            /// Creates an ownership identifier for a domain or updates identifier details
-            /// for an existing identifer
+            /// Description for Creates an ownership identifier for a domain or updates
+            /// identifier details for an existing identifer
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -576,7 +578,7 @@ public static DomainOwnershipIdentifier CreateOrUpdateOwnershipIdentifier(this I
             /// Delete ownership identifier for domain
             /// </summary>
             /// <remarks>
-            /// Delete ownership identifier for domain
+            /// Description for Delete ownership identifier for domain
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -599,7 +601,7 @@ public static void DeleteOwnershipIdentifier(this IDomainsOperations operations,
             /// Delete ownership identifier for domain
             /// </summary>
             /// <remarks>
-            /// Delete ownership identifier for domain
+            /// Description for Delete ownership identifier for domain
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -626,8 +628,8 @@ public static void DeleteOwnershipIdentifier(this IDomainsOperations operations,
             /// for an existing identifer
             /// </summary>
             /// <remarks>
-            /// Creates an ownership identifier for a domain or updates identifier details
-            /// for an existing identifer
+            /// Description for Creates an ownership identifier for a domain or updates
+            /// identifier details for an existing identifer
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -654,8 +656,8 @@ public static DomainOwnershipIdentifier UpdateOwnershipIdentifier(this IDomainsO
             /// for an existing identifer
             /// </summary>
             /// <remarks>
-            /// Creates an ownership identifier for a domain or updates identifier details
-            /// for an existing identifer
+            /// Description for Creates an ownership identifier for a domain or updates
+            /// identifier details for an existing identifer
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -687,7 +689,7 @@ public static DomainOwnershipIdentifier UpdateOwnershipIdentifier(this IDomainsO
             /// Renew a domain.
             /// </summary>
             /// <remarks>
-            /// Renew a domain.
+            /// Description for Renew a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -707,7 +709,7 @@ public static void Renew(this IDomainsOperations operations, string resourceGrou
             /// Renew a domain.
             /// </summary>
             /// <remarks>
-            /// Renew a domain.
+            /// Description for Renew a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -730,7 +732,7 @@ public static void Renew(this IDomainsOperations operations, string resourceGrou
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -753,7 +755,7 @@ public static Domain BeginCreateOrUpdate(this IDomainsOperations operations, str
             /// Creates or updates a domain.
             /// </summary>
             /// <remarks>
-            /// Creates or updates a domain.
+            /// Description for Creates or updates a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -782,7 +784,7 @@ public static Domain BeginCreateOrUpdate(this IDomainsOperations operations, str
             /// Get all domains in a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a subscription.
+            /// Description for Get all domains in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -799,7 +801,7 @@ public static IPage<Domain> ListNext(this IDomainsOperations operations, string
             /// Get all domains in a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a subscription.
+            /// Description for Get all domains in a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -822,7 +824,7 @@ public static IPage<Domain> ListNext(this IDomainsOperations operations, string
             /// Get domain name recommendations based on keywords.
             /// </summary>
             /// <remarks>
-            /// Get domain name recommendations based on keywords.
+            /// Description for Get domain name recommendations based on keywords.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -839,7 +841,7 @@ public static IPage<NameIdentifier> ListRecommendationsNext(this IDomainsOperati
             /// Get domain name recommendations based on keywords.
             /// </summary>
             /// <remarks>
-            /// Get domain name recommendations based on keywords.
+            /// Description for Get domain name recommendations based on keywords.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -862,7 +864,7 @@ public static IPage<NameIdentifier> ListRecommendationsNext(this IDomainsOperati
             /// Get all domains in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a resource group.
+            /// Description for Get all domains in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -879,7 +881,7 @@ public static IPage<Domain> ListByResourceGroupNext(this IDomainsOperations oper
             /// Get all domains in a resource group.
             /// </summary>
             /// <remarks>
-            /// Get all domains in a resource group.
+            /// Description for Get all domains in a resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -902,7 +904,7 @@ public static IPage<Domain> ListByResourceGroupNext(this IDomainsOperations oper
             /// Lists domain ownership identifiers.
             /// </summary>
             /// <remarks>
-            /// Lists domain ownership identifiers.
+            /// Description for Lists domain ownership identifiers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -919,7 +921,7 @@ public static IPage<DomainOwnershipIdentifier> ListOwnershipIdentifiersNext(this
             /// Lists domain ownership identifiers.
             /// </summary>
             /// <remarks>
-            /// Lists domain ownership identifiers.
+            /// Description for Lists domain ownership identifiers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs
index c1f3b6f2e141..ea68b4c9a69c 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceCertificateOrdersOperations.cs
@@ -27,7 +27,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// List all certificate orders in a subscription.
         /// </summary>
         /// <remarks>
-        /// List all certificate orders in a subscription.
+        /// Description for List all certificate orders in a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,7 +49,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Validate information for a certificate order.
         /// </summary>
         /// <remarks>
-        /// Validate information for a certificate order.
+        /// Description for Validate information for a certificate order.
         /// </remarks>
         /// <param name='appServiceCertificateOrder'>
         /// Information for a certificate order.
@@ -60,7 +60,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -71,7 +71,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Get certificate orders in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get certificate orders in a resource group.
+        /// Description for Get certificate orders in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -96,7 +96,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Get a certificate order.
         /// </summary>
         /// <remarks>
-        /// Get a certificate order.
+        /// Description for Get a certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -124,7 +124,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -155,7 +155,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Delete an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Delete an existing certificate order.
+        /// Description for Delete an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -169,7 +169,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -180,7 +180,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -211,7 +211,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// List all certificates associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// List all certificates associated with a certificate order.
+        /// Description for List all certificates associated with a certificate
+        /// order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -239,7 +240,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Get the certificate associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// Get the certificate associated with a certificate order.
+        /// Description for Get the certificate associated with a certificate
+        /// order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -271,8 +273,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault
-        /// secret.
+        /// Description for Creates or updates a certificate and associates
+        /// with key vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -306,7 +308,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Delete the certificate associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// Delete the certificate associated with a certificate order.
+        /// Description for Delete the certificate associated with a
+        /// certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -323,7 +326,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -335,8 +338,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault
-        /// secret.
+        /// Description for Creates or updates a certificate and associates
+        /// with key vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -370,7 +373,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Reissue an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Reissue an existing certificate order.
+        /// Description for Reissue an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -387,7 +390,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -398,7 +401,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Renew an existing certificate order.
         /// </summary>
         /// <remarks>
-        /// Renew an existing certificate order.
+        /// Description for Renew an existing certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -415,7 +418,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -426,7 +429,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Resend certificate email.
         /// </summary>
         /// <remarks>
-        /// Resend certificate email.
+        /// Description for Resend certificate email.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -440,7 +443,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -451,7 +454,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -468,7 +471,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -479,7 +482,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -510,7 +513,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Verify domain ownership for this certificate order.
         /// </summary>
         /// <remarks>
-        /// Verify domain ownership for this certificate order.
+        /// Description for Verify domain ownership for this certificate order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -524,7 +527,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -535,7 +538,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Retrieve the list of certificate actions.
         /// </summary>
         /// <remarks>
-        /// Retrieve the list of certificate actions.
+        /// Description for Retrieve the list of certificate actions.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -563,7 +566,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Retrieve email history.
         /// </summary>
         /// <remarks>
-        /// Retrieve email history.
+        /// Description for Retrieve email history.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -591,7 +594,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Create or update a certificate purchase order.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate purchase order.
+        /// Description for Create or update a certificate purchase order.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -623,8 +626,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// secret.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a certificate and associates with key vault
-        /// secret.
+        /// Description for Creates or updates a certificate and associates
+        /// with key vault secret.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -658,7 +661,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// List all certificate orders in a subscription.
         /// </summary>
         /// <remarks>
-        /// List all certificate orders in a subscription.
+        /// Description for List all certificate orders in a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -683,7 +686,7 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// Get certificate orders in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get certificate orders in a resource group.
+        /// Description for Get certificate orders in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -708,7 +711,8 @@ public partial interface IAppServiceCertificateOrdersOperations
         /// List all certificates associated with a certificate order.
         /// </summary>
         /// <remarks>
-        /// List all certificates associated with a certificate order.
+        /// Description for List all certificates associated with a certificate
+        /// order.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceEnvironmentsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceEnvironmentsOperations.cs
index 0caebf71d17b..a95032f627c6 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceEnvironmentsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServiceEnvironmentsOperations.cs
@@ -27,7 +27,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service Environments for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments for a subscription.
+        /// Description for Get all App Service Environments for a
+        /// subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,7 +50,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service Environments in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments in a resource group.
+        /// Description for Get all App Service Environments in a resource
+        /// group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74,7 +76,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get the properties of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the properties of an App Service Environment.
+        /// Description for Get the properties of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -102,7 +104,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -119,7 +121,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -133,7 +135,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Delete an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Delete an App Service Environment.
+        /// Description for Delete an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -152,7 +154,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -163,7 +165,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -180,7 +182,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -195,8 +197,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get the used, available, and total worker capacity an App Service
-        /// Environment.
+        /// Description for Get the used, available, and total worker capacity
+        /// an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -224,7 +226,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get IP addresses assigned to an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get IP addresses assigned to an App Service Environment.
+        /// Description for Get IP addresses assigned to an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -247,12 +250,13 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<AddressResponse>> ListVipsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<AddressResponse>> GetVipInfoWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different
+        /// VNET.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -283,7 +287,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get diagnostic information for an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get diagnostic information for an App Service Environment.
+        /// Description for Get diagnostic information for an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -311,7 +316,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get a diagnostics item for an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get a diagnostics item for an App Service Environment.
+        /// Description for Get a diagnostics item for an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -343,8 +349,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all inbound dependencies of an App
-        /// Service Environment.
+        /// Description for Get the network endpoints of all inbound
+        /// dependencies of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -369,77 +375,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>> GetInboundNetworkDependenciesEndpointsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get global metric definitions of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get global metric definitions of an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<MetricDefinition>> ListMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get global metrics of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get global metrics of an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms
-        /// to odata syntax. Example: $filter=(name.value eq 'Metric1' or
-        /// name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and
-        /// endTime eq 2014-12-31T23:59:59Z and timeGrain eq
-        /// duration'[Hour|Minute|Day]'.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get all multi-role pools.
         /// </summary>
         /// <remarks>
-        /// Get all multi-role pools.
+        /// Description for Get all multi-role pools.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -467,7 +406,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get properties of a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get properties of a multi-role pool.
+        /// Description for Get properties of a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -495,7 +434,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a multi-role pool.
+        /// Description for Create or update a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -512,7 +451,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -526,7 +465,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a multi-role pool.
+        /// Description for Create or update a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -543,7 +482,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -558,8 +497,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a multi-role pool
-        /// of an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a
+        /// multi-role pool of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -587,49 +526,12 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a specific instance of a multi-role pool of an App
-        /// Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a specific instance of a multi-role pool of an App
-        /// Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the multi-role pool.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRolePoolInstanceMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string instance, bool? details = default(bool?), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get metric definitions for a multi-role pool of an App Service
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a multi-role pool of an App Service
-        /// Environment.
+        /// Description for Get metric definitions for a multi-role pool of an
+        /// App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -654,58 +556,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a multi-role pool of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a multi-role pool of an App Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='startTime'>
-        /// Beginning time of the metrics query.
-        /// </param>
-        /// <param name='endTime'>
-        /// End time of the metrics query.
-        /// </param>
-        /// <param name='timeGrain'>
-        /// Time granularity of the metrics query.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms
-        /// to odata syntax. Example: $filter=(name.value eq 'Metric1' or
-        /// name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and
-        /// endTime eq 2014-12-31T23:59:59Z and timeGrain eq
-        /// duration'[Hour|Minute|Day]'.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRoleMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string startTime = default(string), string endTime = default(string), string timeGrain = default(string), bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get available SKUs for scaling a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Description for Get available SKUs for scaling a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -734,8 +588,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a multi-role pool of an App Service
-        /// Environment.
+        /// Description for Get usage metrics for a multi-role pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -764,8 +618,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// List all currently running operations on the App Service
-        /// Environment.
+        /// Description for List all currently running operations on the App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -794,8 +648,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all outbound dependencies of an App
-        /// Service Environment.
+        /// Description for Get the network endpoints of all outbound
+        /// dependencies of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -823,7 +677,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Reboot all machines in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Reboot all machines in an App Service Environment.
+        /// Description for Reboot all machines in an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -837,7 +691,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -848,7 +702,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -876,7 +730,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service plans in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in an App Service Environment.
+        /// Description for Get all App Service plans in an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -904,7 +759,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all apps in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all apps in an App Service Environment.
+        /// Description for Get all apps in an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -935,7 +790,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -963,7 +818,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get global usage metrics of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get global usage metrics of an App Service Environment.
+        /// Description for Get global usage metrics of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -998,7 +854,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all worker pools of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all worker pools of an App Service Environment.
+        /// Description for Get all worker pools of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1026,7 +882,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get properties of a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get properties of a worker pool.
+        /// Description for Get properties of a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1057,7 +913,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a worker pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a worker pool.
+        /// Description for Create or update a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1077,7 +933,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1091,7 +947,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a worker pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a worker pool.
+        /// Description for Create or update a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1111,7 +967,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1126,8 +982,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a worker pool of
-        /// an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a
+        /// worker pool of an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1158,59 +1014,12 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, string instance, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a specific instance of a worker pool of an App
-        /// Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a specific instance of a worker pool of an App
-        /// Service Environment.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of the worker pool.
-        /// </param>
-        /// <param name='instance'>
-        /// Name of the instance in the worker pool.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms
-        /// to odata syntax. Example: $filter=(name.value eq 'Metric1' or
-        /// name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and
-        /// endTime eq 2014-12-31T23:59:59Z and timeGrain eq
-        /// duration'[Hour|Minute|Day]'.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWorkerPoolInstanceMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, string instance, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get metric definitions for a worker pool of an App Service
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a worker pool of an App Service
-        /// Environment.
+        /// Description for Get metric definitions for a worker pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1238,54 +1047,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App
-        /// Service Environment).
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App
-        /// Service Environment).
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service Environment.
-        /// </param>
-        /// <param name='workerPoolName'>
-        /// Name of worker pool
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms
-        /// to odata syntax. Example: $filter=(name.value eq 'Metric1' or
-        /// name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and
-        /// endTime eq 2014-12-31T23:59:59Z and timeGrain eq
-        /// duration'[Hour|Minute|Day]'.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWebWorkerMetricsWithHttpMessagesAsync(string resourceGroupName, string name, string workerPoolName, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get available SKUs for scaling a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a worker pool.
+        /// Description for Get available SKUs for scaling a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1316,7 +1081,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get usage metrics for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a worker pool of an App Service Environment.
+        /// Description for Get usage metrics for a worker pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1347,7 +1113,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Create or update an App Service Environment.
+        /// Description for Create or update an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1364,7 +1130,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1378,7 +1144,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Delete an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Delete an App Service Environment.
+        /// Description for Delete an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1397,7 +1163,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1408,7 +1174,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different
+        /// VNET.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1439,7 +1206,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a multi-role pool.
+        /// Description for Create or update a multi-role pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1456,7 +1223,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1470,7 +1237,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1498,7 +1265,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1526,7 +1293,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Create or update a worker pool.
         /// </summary>
         /// <remarks>
-        /// Create or update a worker pool.
+        /// Description for Create or update a worker pool.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1546,7 +1313,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1560,7 +1327,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service Environments for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments for a subscription.
+        /// Description for Get all App Service Environments for a
+        /// subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1585,7 +1353,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service Environments in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service Environments in a resource group.
+        /// Description for Get all App Service Environments in a resource
+        /// group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1611,8 +1380,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get the used, available, and total worker capacity an App Service
-        /// Environment.
+        /// Description for Get the used, available, and total worker capacity
+        /// an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1637,7 +1406,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different
+        /// VNET.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1663,8 +1433,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all inbound dependencies of an App
-        /// Service Environment.
+        /// Description for Get the network endpoints of all inbound
+        /// dependencies of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1686,35 +1456,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<InboundEnvironmentEndpoint>>> GetInboundNetworkDependenciesEndpointsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get global metrics of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get global metrics of an App Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get all multi-role pools.
         /// </summary>
         /// <remarks>
-        /// Get all multi-role pools.
+        /// Description for Get all multi-role pools.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1740,8 +1485,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a multi-role pool
-        /// of an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a
+        /// multi-role pool of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1763,39 +1508,12 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRolePoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a specific instance of a multi-role pool of an App
-        /// Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a specific instance of a multi-role pool of an App
-        /// Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRolePoolInstanceMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get metric definitions for a multi-role pool of an App Service
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a multi-role pool of an App Service
-        /// Environment.
+        /// Description for Get metric definitions for a multi-role pool of an
+        /// App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1817,35 +1535,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMultiRoleMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a multi-role pool of an App Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a multi-role pool of an App Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMultiRoleMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get available SKUs for scaling a multi-role pool.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a multi-role pool.
+        /// Description for Get available SKUs for scaling a multi-role pool.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1871,8 +1564,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a multi-role pool of an App Service
-        /// Environment.
+        /// Description for Get usage metrics for a multi-role pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1898,8 +1591,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get the network endpoints of all outbound dependencies of an App
-        /// Service Environment.
+        /// Description for Get the network endpoints of all outbound
+        /// dependencies of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1924,7 +1617,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1949,7 +1642,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all App Service plans in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in an App Service Environment.
+        /// Description for Get all App Service plans in an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1974,7 +1668,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all apps in an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all apps in an App Service Environment.
+        /// Description for Get all apps in an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1999,7 +1693,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2024,7 +1718,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get global usage metrics of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get global usage metrics of an App Service Environment.
+        /// Description for Get global usage metrics of an App Service
+        /// Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2049,7 +1744,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get all worker pools of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get all worker pools of an App Service Environment.
+        /// Description for Get all worker pools of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2075,8 +1770,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a specific instance of a worker pool of
-        /// an App Service Environment.
+        /// Description for Get metric definitions for a specific instance of a
+        /// worker pool of an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2098,39 +1793,12 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWorkerPoolInstanceMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a specific instance of a worker pool of an App
-        /// Service Environment.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a specific instance of a worker pool of an App
-        /// Service Environment.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWorkerPoolInstanceMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get metric definitions for a worker pool of an App Service
         /// Environment.
         /// </summary>
         /// <remarks>
-        /// Get metric definitions for a worker pool of an App Service
-        /// Environment.
+        /// Description for Get metric definitions for a worker pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2152,37 +1820,10 @@ public partial interface IAppServiceEnvironmentsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListWebWorkerMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App
-        /// Service Environment).
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for a worker pool of a AppServiceEnvironment (App
-        /// Service Environment).
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListWebWorkerMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get available SKUs for scaling a worker pool.
         /// </summary>
         /// <remarks>
-        /// Get available SKUs for scaling a worker pool.
+        /// Description for Get available SKUs for scaling a worker pool.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2207,7 +1848,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Get usage metrics for a worker pool of an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Get usage metrics for a worker pool of an App Service Environment.
+        /// Description for Get usage metrics for a worker pool of an App
+        /// Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2232,7 +1874,8 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Move an App Service Environment to a different VNET.
         /// </summary>
         /// <remarks>
-        /// Move an App Service Environment to a different VNET.
+        /// Description for Move an App Service Environment to a different
+        /// VNET.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2257,7 +1900,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Resume an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Resume an App Service Environment.
+        /// Description for Resume an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -2282,7 +1925,7 @@ public partial interface IAppServiceEnvironmentsOperations
         /// Suspend an App Service Environment.
         /// </summary>
         /// <remarks>
-        /// Suspend an App Service Environment.
+        /// Description for Suspend an App Service Environment.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs
index bbf558a5cea9..308908b9006c 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IAppServicePlansOperations.cs
@@ -27,7 +27,7 @@ public partial interface IAppServicePlansOperations
         /// Get all App Service plans for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans for a subscription.
+        /// Description for Get all App Service plans for a subscription.
         /// </remarks>
         /// <param name='detailed'>
         /// Specify &lt;code&gt;true&lt;/code&gt; to return all App Service
@@ -55,7 +55,7 @@ public partial interface IAppServicePlansOperations
         /// Get all App Service plans in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in a resource group.
+        /// Description for Get all App Service plans in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -80,7 +80,7 @@ public partial interface IAppServicePlansOperations
         /// Get an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get an App Service plan.
+        /// Description for Get an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -94,7 +94,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -108,7 +108,7 @@ public partial interface IAppServicePlansOperations
         /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Creates or updates an App Service Plan.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -139,7 +139,7 @@ public partial interface IAppServicePlansOperations
         /// Delete an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Delete an App Service plan.
+        /// Description for Delete an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -153,7 +153,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -164,7 +164,7 @@ public partial interface IAppServicePlansOperations
         /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Creates or updates an App Service Plan.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -195,7 +195,7 @@ public partial interface IAppServicePlansOperations
         /// List all capabilities of an App Service plan.
         /// </summary>
         /// <remarks>
-        /// List all capabilities of an App Service plan.
+        /// Description for List all capabilities of an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -223,7 +223,8 @@ public partial interface IAppServicePlansOperations
         /// Retrieve a Hybrid Connection in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Retrieve a Hybrid Connection in use in an App Service plan.
+        /// Description for Retrieve a Hybrid Connection in use in an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -257,7 +258,8 @@ public partial interface IAppServicePlansOperations
         /// Delete a Hybrid Connection in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Delete a Hybrid Connection in use in an App Service plan.
+        /// Description for Delete a Hybrid Connection in use in an App Service
+        /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -277,7 +279,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -288,7 +290,8 @@ public partial interface IAppServicePlansOperations
         /// Get the send key name and value of a Hybrid Connection.
         /// </summary>
         /// <remarks>
-        /// Get the send key name and value of a Hybrid Connection.
+        /// Description for Get the send key name and value of a Hybrid
+        /// Connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -322,7 +325,8 @@ public partial interface IAppServicePlansOperations
         /// Get all apps that use a Hybrid Connection in an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps that use a Hybrid Connection in an App Service Plan.
+        /// Description for Get all apps that use a Hybrid Connection in an App
+        /// Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -357,8 +361,8 @@ public partial interface IAppServicePlansOperations
         /// Service plan.
         /// </summary>
         /// <remarks>
-        /// Get the maximum number of Hybrid Connections allowed in an App
-        /// Service plan.
+        /// Description for Get the maximum number of Hybrid Connections
+        /// allowed in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -386,7 +390,8 @@ public partial interface IAppServicePlansOperations
         /// Retrieve all Hybrid Connections in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Retrieve all Hybrid Connections in use in an App Service plan.
+        /// Description for Retrieve all Hybrid Connections in use in an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -411,79 +416,10 @@ public partial interface IAppServicePlansOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<HybridConnection>>> ListHybridConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefintionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get metrics for an App Service plan.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for an App Service plan.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the App Service plan.
-        /// </param>
-        /// <param name='details'>
-        /// Specify &lt;code&gt;true&lt;/code&gt; to include instance details.
-        /// The default is &lt;code&gt;false&lt;/code&gt;.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only usages/metrics specified in the filter. Filter conforms
-        /// to odata syntax. Example: $filter=(name.value eq 'Metric1' or
-        /// name.value eq 'Metric2') and startTime eq 2014-01-01T00:00:00Z and
-        /// endTime eq 2014-12-31T23:59:59Z and timeGrain eq
-        /// duration'[Hour|Minute|Day]'.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Restart all apps in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Restart all apps in an App Service plan.
+        /// Description for Restart all apps in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -503,7 +439,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -514,7 +450,7 @@ public partial interface IAppServicePlansOperations
         /// Get all apps associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps associated with an App Service plan.
+        /// Description for Get all apps associated with an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -555,7 +491,8 @@ public partial interface IAppServicePlansOperations
         /// Gets all selectable SKUs for a given App Service Plan
         /// </summary>
         /// <remarks>
-        /// Gets all selectable SKUs for a given App Service Plan
+        /// Description for Gets all selectable SKUs for a given App Service
+        /// Plan
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -583,7 +520,7 @@ public partial interface IAppServicePlansOperations
         /// Gets server farm usage information
         /// </summary>
         /// <remarks>
-        /// Gets server farm usage information
+        /// Description for Gets server farm usage information
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -616,7 +553,8 @@ public partial interface IAppServicePlansOperations
         /// Get all Virtual Networks associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all Virtual Networks associated with an App Service plan.
+        /// Description for Get all Virtual Networks associated with an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -644,7 +582,8 @@ public partial interface IAppServicePlansOperations
         /// Get a Virtual Network associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network associated with an App Service plan.
+        /// Description for Get a Virtual Network associated with an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -661,7 +600,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -675,7 +614,7 @@ public partial interface IAppServicePlansOperations
         /// Get a Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network gateway.
+        /// Description for Get a Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -709,7 +648,7 @@ public partial interface IAppServicePlansOperations
         /// Update a Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Update a Virtual Network gateway.
+        /// Description for Update a Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -747,8 +686,8 @@ public partial interface IAppServicePlansOperations
         /// Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all routes that are associated with a Virtual Network in an App
-        /// Service plan.
+        /// Description for Get all routes that are associated with a Virtual
+        /// Network in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -779,7 +718,7 @@ public partial interface IAppServicePlansOperations
         /// Get a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get a Virtual Network route in an App Service plan.
+        /// Description for Get a Virtual Network route in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -799,7 +738,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -813,7 +752,8 @@ public partial interface IAppServicePlansOperations
         /// Create or update a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Create or update a Virtual Network route in an App Service plan.
+        /// Description for Create or update a Virtual Network route in an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -836,7 +776,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -850,7 +790,8 @@ public partial interface IAppServicePlansOperations
         /// Delete a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Delete a Virtual Network route in an App Service plan.
+        /// Description for Delete a Virtual Network route in an App Service
+        /// plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -870,7 +811,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -881,7 +822,8 @@ public partial interface IAppServicePlansOperations
         /// Create or update a Virtual Network route in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Create or update a Virtual Network route in an App Service plan.
+        /// Description for Create or update a Virtual Network route in an App
+        /// Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -904,7 +846,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -918,7 +860,7 @@ public partial interface IAppServicePlansOperations
         /// Reboot a worker machine in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Reboot a worker machine in an App Service plan.
+        /// Description for Reboot a worker machine in an App Service plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -935,7 +877,7 @@ public partial interface IAppServicePlansOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -946,7 +888,7 @@ public partial interface IAppServicePlansOperations
         /// Creates or updates an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Creates or updates an App Service Plan.
+        /// Description for Creates or updates an App Service Plan.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -977,7 +919,7 @@ public partial interface IAppServicePlansOperations
         /// Get all App Service plans for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans for a subscription.
+        /// Description for Get all App Service plans for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1002,7 +944,7 @@ public partial interface IAppServicePlansOperations
         /// Get all App Service plans in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all App Service plans in a resource group.
+        /// Description for Get all App Service plans in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1027,7 +969,8 @@ public partial interface IAppServicePlansOperations
         /// Get all apps that use a Hybrid Connection in an App Service Plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps that use a Hybrid Connection in an App Service Plan.
+        /// Description for Get all apps that use a Hybrid Connection in an App
+        /// Service Plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1052,7 +995,8 @@ public partial interface IAppServicePlansOperations
         /// Retrieve all Hybrid Connections in use in an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Retrieve all Hybrid Connections in use in an App Service plan.
+        /// Description for Retrieve all Hybrid Connections in use in an App
+        /// Service plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1074,62 +1018,10 @@ public partial interface IAppServicePlansOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<HybridConnection>>> ListHybridConnectionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics that can be queried for an App Service plan, and their
-        /// definitions.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefintionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get metrics for an App Service plan.
-        /// </summary>
-        /// <remarks>
-        /// Get metrics for an App Service plan.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Get all apps associated with an App Service plan.
         /// </summary>
         /// <remarks>
-        /// Get all apps associated with an App Service plan.
+        /// Description for Get all apps associated with an App Service plan.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1154,7 +1046,7 @@ public partial interface IAppServicePlansOperations
         /// Gets server farm usage information
         /// </summary>
         /// <remarks>
-        /// Gets server farm usage information
+        /// Description for Gets server farm usage information
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificateRegistrationProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificateRegistrationProviderOperations.cs
index 643ca2f513c1..64a54e2213c6 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificateRegistrationProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificateRegistrationProviderOperations.cs
@@ -28,8 +28,8 @@ public partial interface ICertificateRegistrationProviderOperations
         /// Apis under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm
-        /// Apis under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list
+        /// of available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -52,8 +52,8 @@ public partial interface ICertificateRegistrationProviderOperations
         /// Apis under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm
-        /// Apis under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list
+        /// of available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs
index 4bbcc9267073..949867d9a615 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ICertificatesOperations.cs
@@ -27,7 +27,7 @@ public partial interface ICertificatesOperations
         /// Get all certificates for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all certificates for a subscription.
+        /// Description for Get all certificates for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,7 +49,7 @@ public partial interface ICertificatesOperations
         /// Get all certificates in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all certificates in a resource group.
+        /// Description for Get all certificates in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74,7 +74,7 @@ public partial interface ICertificatesOperations
         /// Get a certificate.
         /// </summary>
         /// <remarks>
-        /// Get a certificate.
+        /// Description for Get a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -102,7 +102,7 @@ public partial interface ICertificatesOperations
         /// Create or update a certificate.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate.
+        /// Description for Create or update a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -133,7 +133,7 @@ public partial interface ICertificatesOperations
         /// Delete a certificate.
         /// </summary>
         /// <remarks>
-        /// Delete a certificate.
+        /// Description for Delete a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -147,7 +147,7 @@ public partial interface ICertificatesOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -158,7 +158,7 @@ public partial interface ICertificatesOperations
         /// Create or update a certificate.
         /// </summary>
         /// <remarks>
-        /// Create or update a certificate.
+        /// Description for Create or update a certificate.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -189,7 +189,7 @@ public partial interface ICertificatesOperations
         /// Get all certificates for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all certificates for a subscription.
+        /// Description for Get all certificates for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -214,7 +214,7 @@ public partial interface ICertificatesOperations
         /// Get all certificates in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all certificates in a resource group.
+        /// Description for Get all certificates in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDeletedWebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDeletedWebAppsOperations.cs
index a5d405f8ef1d..62f021f9a3a9 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDeletedWebAppsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDeletedWebAppsOperations.cs
@@ -27,7 +27,7 @@ public partial interface IDeletedWebAppsOperations
         /// Get all deleted apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription.
+        /// Description for Get all deleted apps for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,7 +49,7 @@ public partial interface IDeletedWebAppsOperations
         /// Get all deleted apps for a subscription at location
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription at location
+        /// Description for Get all deleted apps for a subscription at location
         /// </remarks>
         /// <param name='location'>
         /// </param>
@@ -73,7 +73,7 @@ public partial interface IDeletedWebAppsOperations
         /// Get deleted app for a subscription at location.
         /// </summary>
         /// <remarks>
-        /// Get deleted app for a subscription at location.
+        /// Description for Get deleted app for a subscription at location.
         /// </remarks>
         /// <param name='location'>
         /// </param>
@@ -100,7 +100,7 @@ public partial interface IDeletedWebAppsOperations
         /// Get all deleted apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription.
+        /// Description for Get all deleted apps for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -125,7 +125,7 @@ public partial interface IDeletedWebAppsOperations
         /// Get all deleted apps for a subscription at location
         /// </summary>
         /// <remarks>
-        /// Get all deleted apps for a subscription at location
+        /// Description for Get all deleted apps for a subscription at location
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs
index f04b748d873b..0c427952c932 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDiagnosticsOperations.cs
@@ -27,7 +27,7 @@ public partial interface IDiagnosticsOperations
         /// List Hosting Environment Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Hosting Environment Detector Responses
+        /// Description for List Hosting Environment Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -55,7 +55,7 @@ public partial interface IDiagnosticsOperations
         /// Get Hosting Environment Detector Response
         /// </summary>
         /// <remarks>
-        /// Get Hosting Environment Detector Response
+        /// Description for Get Hosting Environment Detector Response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -95,7 +95,7 @@ public partial interface IDiagnosticsOperations
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -123,7 +123,7 @@ public partial interface IDiagnosticsOperations
         /// Get site detector response
         /// </summary>
         /// <remarks>
-        /// Get site detector response
+        /// Description for Get site detector response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -163,7 +163,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -191,7 +191,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Category
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Category
+        /// Description for Get Diagnostics Category
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -222,7 +222,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -253,7 +253,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analysis
         /// </summary>
         /// <remarks>
-        /// Get Site Analysis
+        /// Description for Get Site Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -282,12 +282,12 @@ public partial interface IDiagnosticsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<DiagnosticAnalysis>> GetSiteAnalysisWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<AnalysisDefinition>> GetSiteAnalysisWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute Analysis
         /// </summary>
         /// <remarks>
-        /// Execute Analysis
+        /// Description for Execute Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -330,7 +330,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -361,7 +361,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detector
         /// </summary>
         /// <remarks>
-        /// Get Detector
+        /// Description for Get Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -390,12 +390,12 @@ public partial interface IDiagnosticsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DetectorDefinition>> GetSiteDetectorWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute Detector
         /// </summary>
         /// <remarks>
-        /// Execute Detector
+        /// Description for Execute Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -438,7 +438,7 @@ public partial interface IDiagnosticsOperations
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -469,7 +469,7 @@ public partial interface IDiagnosticsOperations
         /// Get site detector response
         /// </summary>
         /// <remarks>
-        /// Get site detector response
+        /// Description for Get site detector response
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -512,7 +512,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -543,7 +543,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Category
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Category
+        /// Description for Get Diagnostics Category
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -577,7 +577,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -611,7 +611,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analysis
         /// </summary>
         /// <remarks>
-        /// Get Site Analysis
+        /// Description for Get Site Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -643,12 +643,12 @@ public partial interface IDiagnosticsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<DiagnosticAnalysis>> GetSiteAnalysisSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<AnalysisDefinition>> GetSiteAnalysisSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string analysisName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute Analysis
         /// </summary>
         /// <remarks>
-        /// Execute Analysis
+        /// Description for Execute Analysis
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -694,7 +694,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -728,7 +728,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detector
         /// </summary>
         /// <remarks>
-        /// Get Detector
+        /// Description for Get Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -760,12 +760,12 @@ public partial interface IDiagnosticsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DetectorDefinition>> GetSiteDetectorSlotWithHttpMessagesAsync(string resourceGroupName, string siteName, string diagnosticCategory, string detectorName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Execute Detector
         /// </summary>
         /// <remarks>
-        /// Execute Detector
+        /// Description for Execute Detector
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -811,7 +811,7 @@ public partial interface IDiagnosticsOperations
         /// List Hosting Environment Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Hosting Environment Detector Responses
+        /// Description for List Hosting Environment Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -836,7 +836,7 @@ public partial interface IDiagnosticsOperations
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -861,7 +861,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -886,7 +886,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -911,7 +911,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -933,35 +933,10 @@ public partial interface IDiagnosticsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<DetectorDefinition>>> ListSiteDetectorsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get Detector
-        /// </summary>
-        /// <remarks>
-        /// Get Detector
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// List Site Detector Responses
         /// </summary>
         /// <remarks>
-        /// List Site Detector Responses
+        /// Description for List Site Detector Responses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -986,7 +961,7 @@ public partial interface IDiagnosticsOperations
         /// Get Diagnostics Categories
         /// </summary>
         /// <remarks>
-        /// Get Diagnostics Categories
+        /// Description for Get Diagnostics Categories
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1011,7 +986,7 @@ public partial interface IDiagnosticsOperations
         /// Get Site Analyses
         /// </summary>
         /// <remarks>
-        /// Get Site Analyses
+        /// Description for Get Site Analyses
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1036,7 +1011,7 @@ public partial interface IDiagnosticsOperations
         /// Get Detectors
         /// </summary>
         /// <remarks>
-        /// Get Detectors
+        /// Description for Get Detectors
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1057,30 +1032,5 @@ public partial interface IDiagnosticsOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<IPage<DetectorDefinition>>> ListSiteDetectorsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get Detector
-        /// </summary>
-        /// <remarks>
-        /// Get Detector
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<DetectorDefinition>>> GetSiteDetectorSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainRegistrationProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainRegistrationProviderOperations.cs
index ab77d5afa0ef..f95f4e047bdf 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainRegistrationProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainRegistrationProviderOperations.cs
@@ -28,8 +28,8 @@ public partial interface IDomainRegistrationProviderOperations
         /// Apis under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm
-        /// Apis under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list
+        /// of available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -52,8 +52,8 @@ public partial interface IDomainRegistrationProviderOperations
         /// Apis under the resource provider
         /// </summary>
         /// <remarks>
-        /// Implements Csm operations Api to exposes the list of available Csm
-        /// Apis under the resource provider
+        /// Description for Implements Csm operations Api to exposes the list
+        /// of available Csm Apis under the resource provider
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainsOperations.cs
index 06a1d785c83f..26350ec4d859 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IDomainsOperations.cs
@@ -27,7 +27,7 @@ public partial interface IDomainsOperations
         /// Check if a domain is available for registration.
         /// </summary>
         /// <remarks>
-        /// Check if a domain is available for registration.
+        /// Description for Check if a domain is available for registration.
         /// </remarks>
         /// <param name='identifier'>
         /// Name of the domain.
@@ -47,12 +47,12 @@ public partial interface IDomainsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<DomainAvailablilityCheckResult>> CheckAvailabilityWithHttpMessagesAsync(NameIdentifier identifier, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<DomainAvailabilityCheckResult>> CheckAvailabilityWithHttpMessagesAsync(NameIdentifier identifier, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get all domains in a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a subscription.
+        /// Description for Get all domains in a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -74,7 +74,8 @@ public partial interface IDomainsOperations
         /// Generate a single sign-on request for the domain management portal.
         /// </summary>
         /// <remarks>
-        /// Generate a single sign-on request for the domain management portal.
+        /// Description for Generate a single sign-on request for the domain
+        /// management portal.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -96,7 +97,7 @@ public partial interface IDomainsOperations
         /// Get domain name recommendations based on keywords.
         /// </summary>
         /// <remarks>
-        /// Get domain name recommendations based on keywords.
+        /// Description for Get domain name recommendations based on keywords.
         /// </remarks>
         /// <param name='parameters'>
         /// Search parameters for domain name recommendations.
@@ -121,7 +122,7 @@ public partial interface IDomainsOperations
         /// Get all domains in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a resource group.
+        /// Description for Get all domains in a resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -146,7 +147,7 @@ public partial interface IDomainsOperations
         /// Get a domain.
         /// </summary>
         /// <remarks>
-        /// Get a domain.
+        /// Description for Get a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -174,7 +175,7 @@ public partial interface IDomainsOperations
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -205,7 +206,7 @@ public partial interface IDomainsOperations
         /// Delete a domain.
         /// </summary>
         /// <remarks>
-        /// Delete a domain.
+        /// Description for Delete a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -224,7 +225,7 @@ public partial interface IDomainsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -235,7 +236,7 @@ public partial interface IDomainsOperations
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -266,7 +267,7 @@ public partial interface IDomainsOperations
         /// Lists domain ownership identifiers.
         /// </summary>
         /// <remarks>
-        /// Lists domain ownership identifiers.
+        /// Description for Lists domain ownership identifiers.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -294,7 +295,7 @@ public partial interface IDomainsOperations
         /// Get ownership identifier for domain
         /// </summary>
         /// <remarks>
-        /// Get ownership identifier for domain
+        /// Description for Get ownership identifier for domain
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -326,8 +327,8 @@ public partial interface IDomainsOperations
         /// details for an existing identifer
         /// </summary>
         /// <remarks>
-        /// Creates an ownership identifier for a domain or updates identifier
-        /// details for an existing identifer
+        /// Description for Creates an ownership identifier for a domain or
+        /// updates identifier details for an existing identifer
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -361,7 +362,7 @@ public partial interface IDomainsOperations
         /// Delete ownership identifier for domain
         /// </summary>
         /// <remarks>
-        /// Delete ownership identifier for domain
+        /// Description for Delete ownership identifier for domain
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -378,7 +379,7 @@ public partial interface IDomainsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -390,8 +391,8 @@ public partial interface IDomainsOperations
         /// details for an existing identifer
         /// </summary>
         /// <remarks>
-        /// Creates an ownership identifier for a domain or updates identifier
-        /// details for an existing identifer
+        /// Description for Creates an ownership identifier for a domain or
+        /// updates identifier details for an existing identifer
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -425,7 +426,7 @@ public partial interface IDomainsOperations
         /// Renew a domain.
         /// </summary>
         /// <remarks>
-        /// Renew a domain.
+        /// Description for Renew a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -439,7 +440,7 @@ public partial interface IDomainsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -450,7 +451,7 @@ public partial interface IDomainsOperations
         /// Creates or updates a domain.
         /// </summary>
         /// <remarks>
-        /// Creates or updates a domain.
+        /// Description for Creates or updates a domain.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -481,7 +482,7 @@ public partial interface IDomainsOperations
         /// Get all domains in a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a subscription.
+        /// Description for Get all domains in a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -506,7 +507,7 @@ public partial interface IDomainsOperations
         /// Get domain name recommendations based on keywords.
         /// </summary>
         /// <remarks>
-        /// Get domain name recommendations based on keywords.
+        /// Description for Get domain name recommendations based on keywords.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -531,7 +532,7 @@ public partial interface IDomainsOperations
         /// Get all domains in a resource group.
         /// </summary>
         /// <remarks>
-        /// Get all domains in a resource group.
+        /// Description for Get all domains in a resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -556,7 +557,7 @@ public partial interface IDomainsOperations
         /// Lists domain ownership identifiers.
         /// </summary>
         /// <remarks>
-        /// Lists domain ownership identifiers.
+        /// Description for Lists domain ownership identifiers.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IProviderOperations.cs
index c1e13876aea7..662c53798b81 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IProviderOperations.cs
@@ -27,7 +27,8 @@ public partial interface IProviderOperations
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their
+        /// versions
         /// </remarks>
         /// <param name='osTypeSelected'>
         /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
@@ -48,14 +49,14 @@ public partial interface IProviderOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets all available operations for the Microsoft.Web resource
         /// provider. Also exposes resource metric definitions
         /// </summary>
         /// <remarks>
-        /// Gets all available operations for the Microsoft.Web resource
-        /// provider. Also exposes resource metric definitions
+        /// Description for Gets all available operations for the Microsoft.Web
+        /// resource provider. Also exposes resource metric definitions
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -77,7 +78,8 @@ public partial interface IProviderOperations
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their
+        /// versions
         /// </remarks>
         /// <param name='osTypeSelected'>
         /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
@@ -98,12 +100,13 @@ public partial interface IProviderOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksOnPremWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksOnPremWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their
+        /// versions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -123,14 +126,14 @@ public partial interface IProviderOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets all available operations for the Microsoft.Web resource
         /// provider. Also exposes resource metric definitions
         /// </summary>
         /// <remarks>
-        /// Gets all available operations for the Microsoft.Web resource
-        /// provider. Also exposes resource metric definitions
+        /// Description for Gets all available operations for the Microsoft.Web
+        /// resource provider. Also exposes resource metric definitions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -155,7 +158,8 @@ public partial interface IProviderOperations
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their
+        /// versions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -175,6 +179,6 @@ public partial interface IProviderOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksOnPremNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksOnPremNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs
index 41075929e0c9..7b51a7398987 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IRecommendationsOperations.cs
@@ -27,7 +27,7 @@ public partial interface IRecommendationsOperations
         /// List all recommendations for a subscription.
         /// </summary>
         /// <remarks>
-        /// List all recommendations for a subscription.
+        /// Description for List all recommendations for a subscription.
         /// </remarks>
         /// <param name='featured'>
         /// Specify &lt;code&gt;true&lt;/code&gt; to return only the most
@@ -60,7 +60,8 @@ public partial interface IRecommendationsOperations
         /// Reset all recommendation opt-out settings for a subscription.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for a subscription.
+        /// Description for Reset all recommendation opt-out settings for a
+        /// subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -68,7 +69,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -80,8 +81,8 @@ public partial interface IRecommendationsOperations
         /// in the future.
         /// </summary>
         /// <remarks>
-        /// Disables the specified rule so it will not apply to a subscription
-        /// in the future.
+        /// Description for Disables the specified rule so it will not apply to
+        /// a subscription in the future.
         /// </remarks>
         /// <param name='name'>
         /// Rule name
@@ -92,7 +93,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -104,8 +105,8 @@ public partial interface IRecommendationsOperations
         /// time range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the
-        /// time range.
+        /// Description for Get past recommendations for an app, optionally
+        /// specified by the time range.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -144,7 +145,7 @@ public partial interface IRecommendationsOperations
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -182,7 +183,7 @@ public partial interface IRecommendationsOperations
         /// Disable all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Disable all recommendations for an app.
+        /// Description for Disable all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -198,7 +199,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -209,7 +210,8 @@ public partial interface IRecommendationsOperations
         /// Reset all recommendation opt-out settings for an app.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for an app.
+        /// Description for Reset all recommendation opt-out settings for an
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -225,7 +227,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -236,7 +238,7 @@ public partial interface IRecommendationsOperations
         /// Get a recommendation rule for an app.
         /// </summary>
         /// <remarks>
-        /// Get a recommendation rule for an app.
+        /// Description for Get a recommendation rule for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -275,7 +277,8 @@ public partial interface IRecommendationsOperations
         /// Disables the specific rule for a web site permanently.
         /// </summary>
         /// <remarks>
-        /// Disables the specific rule for a web site permanently.
+        /// Description for Disables the specific rule for a web site
+        /// permanently.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -294,7 +297,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -306,8 +309,8 @@ public partial interface IRecommendationsOperations
         /// time range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the
-        /// time range.
+        /// Description for Get past recommendations for an app, optionally
+        /// specified by the time range.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -346,7 +349,7 @@ public partial interface IRecommendationsOperations
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -384,7 +387,7 @@ public partial interface IRecommendationsOperations
         /// Disable all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Disable all recommendations for an app.
+        /// Description for Disable all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -398,7 +401,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -409,7 +412,8 @@ public partial interface IRecommendationsOperations
         /// Reset all recommendation opt-out settings for an app.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for an app.
+        /// Description for Reset all recommendation opt-out settings for an
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -423,7 +427,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -434,7 +438,7 @@ public partial interface IRecommendationsOperations
         /// Get a recommendation rule for an app.
         /// </summary>
         /// <remarks>
-        /// Get a recommendation rule for an app.
+        /// Description for Get a recommendation rule for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -473,7 +477,8 @@ public partial interface IRecommendationsOperations
         /// Disables the specific rule for a web site permanently.
         /// </summary>
         /// <remarks>
-        /// Disables the specific rule for a web site permanently.
+        /// Description for Disables the specific rule for a web site
+        /// permanently.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -490,7 +495,7 @@ public partial interface IRecommendationsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -501,7 +506,7 @@ public partial interface IRecommendationsOperations
         /// List all recommendations for a subscription.
         /// </summary>
         /// <remarks>
-        /// List all recommendations for a subscription.
+        /// Description for List all recommendations for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -527,8 +532,8 @@ public partial interface IRecommendationsOperations
         /// time range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the
-        /// time range.
+        /// Description for Get past recommendations for an app, optionally
+        /// specified by the time range.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -553,7 +558,7 @@ public partial interface IRecommendationsOperations
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -579,8 +584,8 @@ public partial interface IRecommendationsOperations
         /// time range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the
-        /// time range.
+        /// Description for Get past recommendations for an app, optionally
+        /// specified by the time range.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -605,7 +610,7 @@ public partial interface IRecommendationsOperations
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IResourceHealthMetadataOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IResourceHealthMetadataOperations.cs
index 027fd752a793..4e508bdff001 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IResourceHealthMetadataOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IResourceHealthMetadataOperations.cs
@@ -27,7 +27,8 @@ public partial interface IResourceHealthMetadataOperations
         /// List all ResourceHealthMetadata for all sites in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in
+        /// the subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -50,8 +51,8 @@ public partial interface IResourceHealthMetadataOperations
         /// in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the resource group
-        /// in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in
+        /// the resource group in the subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -77,8 +78,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site as a collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site as a collection
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site as a collection
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -107,8 +108,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -137,8 +138,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site as a collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site as a collection
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site as a collection
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -171,8 +172,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -204,7 +205,8 @@ public partial interface IResourceHealthMetadataOperations
         /// List all ResourceHealthMetadata for all sites in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in
+        /// the subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -230,8 +232,8 @@ public partial interface IResourceHealthMetadataOperations
         /// in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the resource group
-        /// in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in
+        /// the resource group in the subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -257,8 +259,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site as a collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site as a collection
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site as a collection
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -284,8 +286,8 @@ public partial interface IResourceHealthMetadataOperations
         /// site as a collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given
-        /// site as a collection
+        /// Description for Gets the category of ResourceHealthMetadata to use
+        /// for the given site as a collection
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ITopLevelDomainsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ITopLevelDomainsOperations.cs
index 47364c8d886b..038b5626128e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ITopLevelDomainsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ITopLevelDomainsOperations.cs
@@ -27,7 +27,8 @@ public partial interface ITopLevelDomainsOperations
         /// Get all top-level domains supported for registration.
         /// </summary>
         /// <remarks>
-        /// Get all top-level domains supported for registration.
+        /// Description for Get all top-level domains supported for
+        /// registration.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,7 +50,7 @@ public partial interface ITopLevelDomainsOperations
         /// Get details of a top-level domain.
         /// </summary>
         /// <remarks>
-        /// Get details of a top-level domain.
+        /// Description for Get details of a top-level domain.
         /// </remarks>
         /// <param name='name'>
         /// Name of the top-level domain.
@@ -75,8 +76,8 @@ public partial interface ITopLevelDomainsOperations
         /// purchasing a domain.
         /// </summary>
         /// <remarks>
-        /// Gets all legal agreements that user needs to accept before
-        /// purchasing a domain.
+        /// Description for Gets all legal agreements that user needs to accept
+        /// before purchasing a domain.
         /// </remarks>
         /// <param name='name'>
         /// Name of the top-level domain.
@@ -104,7 +105,8 @@ public partial interface ITopLevelDomainsOperations
         /// Get all top-level domains supported for registration.
         /// </summary>
         /// <remarks>
-        /// Get all top-level domains supported for registration.
+        /// Description for Get all top-level domains supported for
+        /// registration.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -130,8 +132,8 @@ public partial interface ITopLevelDomainsOperations
         /// purchasing a domain.
         /// </summary>
         /// <remarks>
-        /// Gets all legal agreements that user needs to accept before
-        /// purchasing a domain.
+        /// Description for Gets all legal agreements that user needs to accept
+        /// before purchasing a domain.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs
index 49d135f53882..4cda09e8bb9e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebAppsOperations.cs
@@ -28,7 +28,7 @@ public partial interface IWebAppsOperations
         /// Get all apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all apps for a subscription.
+        /// Description for Get all apps for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -50,7 +50,8 @@ public partial interface IWebAppsOperations
         /// Gets all web, mobile, and API apps in the specified resource group.
         /// </summary>
         /// <remarks>
-        /// Gets all web, mobile, and API apps in the specified resource group.
+        /// Description for Gets all web, mobile, and API apps in the specified
+        /// resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -80,7 +81,7 @@ public partial interface IWebAppsOperations
         /// Gets the details of a web, mobile, or API app.
         /// </summary>
         /// <remarks>
-        /// Gets the details of a web, mobile, or API app.
+        /// Description for Gets the details of a web, mobile, or API app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -94,7 +95,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -109,8 +110,8 @@ public partial interface IWebAppsOperations
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -142,7 +143,8 @@ public partial interface IWebAppsOperations
         /// Deletes a web, mobile, or API app, or one of the deployment slots.
         /// </summary>
         /// <remarks>
-        /// Deletes a web, mobile, or API app, or one of the deployment slots.
+        /// Description for Deletes a web, mobile, or API app, or one of the
+        /// deployment slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -164,7 +166,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -176,8 +178,8 @@ public partial interface IWebAppsOperations
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -209,7 +211,7 @@ public partial interface IWebAppsOperations
         /// Analyze a custom hostname.
         /// </summary>
         /// <remarks>
-        /// Analyze a custom hostname.
+        /// Description for Analyze a custom hostname.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -241,8 +243,8 @@ public partial interface IWebAppsOperations
         /// current slot.
         /// </summary>
         /// <remarks>
-        /// Applies the configuration settings from the target slot onto the
-        /// current slot.
+        /// Description for Applies the configuration settings from the target
+        /// slot onto the current slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -259,7 +261,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -270,7 +272,7 @@ public partial interface IWebAppsOperations
         /// Creates a backup of an app.
         /// </summary>
         /// <remarks>
-        /// Creates a backup of an app.
+        /// Description for Creates a backup of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -302,7 +304,7 @@ public partial interface IWebAppsOperations
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -330,7 +332,7 @@ public partial interface IWebAppsOperations
         /// Gets a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Gets a backup of an app by its ID.
+        /// Description for Gets a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -361,7 +363,7 @@ public partial interface IWebAppsOperations
         /// Deletes a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Deletes a backup of an app by its ID.
+        /// Description for Deletes a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -378,7 +380,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -392,10 +394,10 @@ public partial interface IWebAppsOperations
         /// URL is passed in the request body.
         /// </summary>
         /// <remarks>
-        /// Gets status of a web app backup that may be in progress, including
-        /// secrets associated with the backup, such as the Azure Storage SAS
-        /// URL. Also can be used to update the SAS URL for the backup if a new
-        /// URL is passed in the request body.
+        /// Description for Gets status of a web app backup that may be in
+        /// progress, including secrets associated with the backup, such as the
+        /// Azure Storage SAS URL. Also can be used to update the SAS URL for
+        /// the backup if a new URL is passed in the request body.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -430,8 +432,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -451,7 +453,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -462,7 +464,7 @@ public partial interface IWebAppsOperations
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -490,7 +492,7 @@ public partial interface IWebAppsOperations
         /// Replaces the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the application settings of an app.
+        /// Description for Replaces the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -521,7 +523,7 @@ public partial interface IWebAppsOperations
         /// Gets the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the application settings of an app.
+        /// Description for Gets the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -550,8 +552,8 @@ public partial interface IWebAppsOperations
         /// web app.
         /// </summary>
         /// <remarks>
-        /// Updates the Authentication / Authorization settings associated with
-        /// web app.
+        /// Description for Updates the Authentication / Authorization settings
+        /// associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -582,7 +584,8 @@ public partial interface IWebAppsOperations
         /// Gets the Authentication/Authorization settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Authentication/Authorization settings of an app.
+        /// Description for Gets the Authentication/Authorization settings of
+        /// an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -610,7 +613,8 @@ public partial interface IWebAppsOperations
         /// Updates the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the Azure storage account configurations of an app.
+        /// Description for Updates the Azure storage account configurations of
+        /// an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -641,7 +645,8 @@ public partial interface IWebAppsOperations
         /// Gets the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Azure storage account configurations of an app.
+        /// Description for Gets the Azure storage account configurations of an
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -669,7 +674,7 @@ public partial interface IWebAppsOperations
         /// Updates the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the backup configuration of an app.
+        /// Description for Updates the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -700,7 +705,7 @@ public partial interface IWebAppsOperations
         /// Deletes the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the backup configuration of an app.
+        /// Description for Deletes the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -714,7 +719,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -725,7 +730,7 @@ public partial interface IWebAppsOperations
         /// Gets the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the backup configuration of an app.
+        /// Description for Gets the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -750,10 +755,70 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<BackupRequest>> GetBackupConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Replaces the connection strings of an app.
+        /// Gets the config reference app settings and status of an app
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets the config reference app settings and status
+        /// of an app
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<KeyVaultReferenceCollection>> GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Gets the config reference and status of an app
         /// </summary>
         /// <remarks>
+        /// Description for Gets the config reference and status of an app
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='appSettingKey'>
+        /// App Setting key name.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<KeyVaultReferenceResource>> GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(string resourceGroupName, string name, string appSettingKey, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
         /// Replaces the connection strings of an app.
+        /// </summary>
+        /// <remarks>
+        /// Description for Replaces the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -784,7 +849,7 @@ public partial interface IWebAppsOperations
         /// Gets the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the connection strings of an app.
+        /// Description for Gets the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -812,7 +877,7 @@ public partial interface IWebAppsOperations
         /// Gets the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the logging configuration of an app.
+        /// Description for Gets the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -840,7 +905,7 @@ public partial interface IWebAppsOperations
         /// Updates the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the logging configuration of an app.
+        /// Description for Updates the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -872,7 +937,7 @@ public partial interface IWebAppsOperations
         /// Replaces the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the metadata of an app.
+        /// Description for Replaces the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -903,7 +968,7 @@ public partial interface IWebAppsOperations
         /// Gets the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the metadata of an app.
+        /// Description for Gets the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -931,7 +996,7 @@ public partial interface IWebAppsOperations
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -959,7 +1024,7 @@ public partial interface IWebAppsOperations
         /// Updates the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Updates the Push settings associated with web app.
+        /// Description for Updates the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -990,7 +1055,7 @@ public partial interface IWebAppsOperations
         /// Gets the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Gets the Push settings associated with web app.
+        /// Description for Gets the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1019,8 +1084,8 @@ public partial interface IWebAppsOperations
         /// the slot (not swapped).
         /// </summary>
         /// <remarks>
-        /// Gets the names of app settings and connection strings that stick to
-        /// the slot (not swapped).
+        /// Description for Gets the names of app settings and connection
+        /// strings that stick to the slot (not swapped).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1049,8 +1114,8 @@ public partial interface IWebAppsOperations
         /// that remain with the slot during swap operation.
         /// </summary>
         /// <remarks>
-        /// Updates the names of application settings and connection string
-        /// that remain with the slot during swap operation.
+        /// Description for Updates the names of application settings and
+        /// connection string that remain with the slot during swap operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1082,8 +1147,9 @@ public partial interface IWebAppsOperations
         /// bitness, default documents, virtual applications, Always On, etc.
         /// </summary>
         /// <remarks>
-        /// Gets the configuration of an app, such as platform version and
-        /// bitness, default documents, virtual applications, Always On, etc.
+        /// Description for Gets the configuration of an app, such as platform
+        /// version and bitness, default documents, virtual applications,
+        /// Always On, etc.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1111,7 +1177,7 @@ public partial interface IWebAppsOperations
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1142,7 +1208,7 @@ public partial interface IWebAppsOperations
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1175,9 +1241,9 @@ public partial interface IWebAppsOperations
         /// snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each
-        /// element of the list contains a timestamp and the ID of the
-        /// snapshot.
+        /// Description for Gets a list of web app configuration snapshots
+        /// identifiers. Each element of the list contains a timestamp and the
+        /// ID of the snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1206,8 +1272,8 @@ public partial interface IWebAppsOperations
         /// in time.
         /// </summary>
         /// <remarks>
-        /// Gets a snapshot of the configuration of an app at a previous point
-        /// in time.
+        /// Description for Gets a snapshot of the configuration of an app at a
+        /// previous point in time.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1238,7 +1304,8 @@ public partial interface IWebAppsOperations
         /// Reverts the configuration of an app to a previous snapshot.
         /// </summary>
         /// <remarks>
-        /// Reverts the configuration of an app to a previous snapshot.
+        /// Description for Reverts the configuration of an app to a previous
+        /// snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1255,7 +1322,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1266,7 +1333,8 @@ public partial interface IWebAppsOperations
         /// Gets the last lines of docker logs for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the last lines of docker logs for the given site
+        /// Description for Gets the last lines of docker logs for the given
+        /// site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1294,7 +1362,8 @@ public partial interface IWebAppsOperations
         /// Gets the ZIP archived docker log files for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the ZIP archived docker log files for the given site
+        /// Description for Gets the ZIP archived docker log files for the
+        /// given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1322,7 +1391,8 @@ public partial interface IWebAppsOperations
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1351,8 +1421,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a continuous web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Gets a continuous web job by its ID for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1369,7 +1439,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1384,8 +1454,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Delete a continuous web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Delete a continuous web job by its ID for an app,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1402,7 +1472,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1413,7 +1483,8 @@ public partial interface IWebAppsOperations
         /// Start a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Start a continuous web job for an app, or a deployment slot.
+        /// Description for Start a continuous web job for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1430,7 +1501,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1441,7 +1512,8 @@ public partial interface IWebAppsOperations
         /// Stop a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Stop a continuous web job for an app, or a deployment slot.
+        /// Description for Stop a continuous web job for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1458,7 +1530,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1469,7 +1541,7 @@ public partial interface IWebAppsOperations
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1497,7 +1569,8 @@ public partial interface IWebAppsOperations
         /// Get a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get a deployment by its ID for an app, or a deployment slot.
+        /// Description for Get a deployment by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1528,7 +1601,8 @@ public partial interface IWebAppsOperations
         /// Create a deployment for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create a deployment for an app, or a deployment slot.
+        /// Description for Create a deployment for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1562,7 +1636,8 @@ public partial interface IWebAppsOperations
         /// Delete a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a deployment by its ID for an app, or a deployment slot.
+        /// Description for Delete a deployment by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1579,7 +1654,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1591,8 +1666,8 @@ public partial interface IWebAppsOperations
         /// deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployment log for specific deployment for an app, or a
-        /// deployment slot.
+        /// Description for List deployment log for specific deployment for an
+        /// app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1627,9 +1702,9 @@ public partial interface IWebAppsOperations
         /// stored in a backup.
         /// </summary>
         /// <remarks>
-        /// Discovers an existing app backup that can be restored from a blob
-        /// in Azure storage. Use this to get information about the databases
-        /// stored in a backup.
+        /// Description for Discovers an existing app backup that can be
+        /// restored from a blob in Azure storage. Use this to get information
+        /// about the databases stored in a backup.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1661,7 +1736,8 @@ public partial interface IWebAppsOperations
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated
+        /// with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1689,7 +1765,7 @@ public partial interface IWebAppsOperations
         /// Get domain ownership identifier for web app.
         /// </summary>
         /// <remarks>
-        /// Get domain ownership identifier for web app.
+        /// Description for Get domain ownership identifier for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1721,8 +1797,8 @@ public partial interface IWebAppsOperations
         /// existing ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an
-        /// existing ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app,
+        /// or updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1756,7 +1832,8 @@ public partial interface IWebAppsOperations
         /// Deletes a domain ownership identifier for a web app.
         /// </summary>
         /// <remarks>
-        /// Deletes a domain ownership identifier for a web app.
+        /// Description for Deletes a domain ownership identifier for a web
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1773,7 +1850,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -1785,8 +1862,8 @@ public partial interface IWebAppsOperations
         /// existing ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an
-        /// existing ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app,
+        /// or updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1820,7 +1897,7 @@ public partial interface IWebAppsOperations
         /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1848,7 +1925,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1865,7 +1942,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1879,7 +1956,8 @@ public partial interface IWebAppsOperations
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy
+        /// operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1893,7 +1971,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1907,7 +1985,8 @@ public partial interface IWebAppsOperations
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1921,7 +2000,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1935,7 +2014,8 @@ public partial interface IWebAppsOperations
         /// Fetch a short lived token that can be exchanged for a master key.
         /// </summary>
         /// <remarks>
-        /// Fetch a short lived token that can be exchanged for a master key.
+        /// Description for Fetch a short lived token that can be exchanged for
+        /// a master key.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1964,8 +2044,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get function information by its ID for web site, or a deployment
-        /// slot.
+        /// Description for Get function information by its ID for web site, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1982,7 +2062,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -1996,7 +2076,7 @@ public partial interface IWebAppsOperations
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2030,7 +2110,8 @@ public partial interface IWebAppsOperations
         /// Delete a function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a function for web site, or a deployment slot.
+        /// Description for Delete a function for web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2047,7 +2128,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -2059,8 +2140,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get function secrets for a function in a web site, or a deployment
-        /// slot.
+        /// Description for Get function secrets for a function in a web site,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2091,7 +2172,8 @@ public partial interface IWebAppsOperations
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2120,8 +2202,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named hostname binding for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named hostname binding for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2152,7 +2234,7 @@ public partial interface IWebAppsOperations
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2187,7 +2269,7 @@ public partial interface IWebAppsOperations
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2204,7 +2286,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -2216,8 +2298,8 @@ public partial interface IWebAppsOperations
         /// App.
         /// </summary>
         /// <remarks>
-        /// Retrieves a specific Service Bus Hybrid Connection used by this Web
-        /// App.
+        /// Description for Retrieves a specific Service Bus Hybrid Connection
+        /// used by this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2251,7 +2333,8 @@ public partial interface IWebAppsOperations
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus
+        /// relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2288,7 +2371,7 @@ public partial interface IWebAppsOperations
         /// Removes a Hybrid Connection from this site.
         /// </summary>
         /// <remarks>
-        /// Removes a Hybrid Connection from this site.
+        /// Description for Removes a Hybrid Connection from this site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2308,7 +2391,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -2319,7 +2402,8 @@ public partial interface IWebAppsOperations
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus
+        /// relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2353,44 +2437,11 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<HybridConnection>> UpdateHybridConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, HybridConnection connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </summary>
-        /// <remarks>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='namespaceName'>
-        /// The namespace for this hybrid connection.
-        /// </param>
-        /// <param name='relayName'>
-        /// The relay name for this hybrid connection.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<HybridConnectionKey>> ListHybridConnectionKeysWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Retrieves all Service Bus Hybrid Connections used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+        /// Description for Retrieves all Service Bus Hybrid Connections used
+        /// by this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2419,8 +2470,8 @@ public partial interface IWebAppsOperations
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets hybrid connections configured for an app (or deployment slot,
-        /// if specified).
+        /// Description for Gets hybrid connections configured for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2448,7 +2499,7 @@ public partial interface IWebAppsOperations
         /// Gets a hybrid connection configuration by its name.
         /// </summary>
         /// <remarks>
-        /// Gets a hybrid connection configuration by its name.
+        /// Description for Gets a hybrid connection configuration by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2480,8 +2531,8 @@ public partial interface IWebAppsOperations
         /// existing one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an
-        /// existing one (PATCH).
+        /// Description for Creates a new hybrid connection configuration
+        /// (PUT), or updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2515,7 +2566,7 @@ public partial interface IWebAppsOperations
         /// Deletes a relay service connection by its name.
         /// </summary>
         /// <remarks>
-        /// Deletes a relay service connection by its name.
+        /// Description for Deletes a relay service connection by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2532,7 +2583,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -2544,8 +2595,8 @@ public partial interface IWebAppsOperations
         /// existing one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an
-        /// existing one (PATCH).
+        /// Description for Creates a new hybrid connection configuration
+        /// (PUT), or updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2579,7 +2630,7 @@ public partial interface IWebAppsOperations
         /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2604,19 +2655,18 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the status of the last MSDeploy operation.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
+        /// Name of the app.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of web app instance.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -2633,12 +2683,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<WebSiteInstanceStatus>> GetInstanceInfoWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Invoke the MSDeploy web app extension.
+        /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2649,7 +2699,38 @@ public partial interface IWebAppsOperations
         /// <param name='instanceId'>
         /// ID of web app instance.
         /// </param>
-        /// <param name='mSDeploy'>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Invoke the MSDeploy web app extension.
+        /// </summary>
+        /// <remarks>
+        /// Description for Invoke the MSDeploy web app extension.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
+        /// </param>
+        /// <param name='instanceId'>
+        /// ID of web app instance.
+        /// </param>
+        /// <param name='mSDeploy'>
         /// Details of MSDeploy operation
         /// </param>
         /// <param name='customHeaders'>
@@ -2658,7 +2739,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2672,7 +2753,8 @@ public partial interface IWebAppsOperations
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy
+        /// operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2689,7 +2771,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2704,8 +2786,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2724,7 +2807,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2739,8 +2822,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2762,7 +2845,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2777,8 +2860,8 @@ public partial interface IWebAppsOperations
         /// or specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot,
-        /// or specific scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2800,7 +2883,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -2812,8 +2895,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get a memory dump of a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2835,7 +2918,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2850,8 +2933,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2873,7 +2956,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2888,8 +2971,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2914,7 +2997,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -2929,45 +3012,7 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET
-        /// api/sites/{siteName}/instances".
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a
+        /// Description for List the threads in a process by its ID for a
         /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -2979,9 +3024,6 @@ public partial interface IWebAppsOperations
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
         /// <param name='instanceId'>
         /// ID of a specific scaled-out instance. This is the value of the name
         /// property in the JSON response from "GET
@@ -2993,7 +3035,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -3002,14 +3044,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessThreadInfo>> GetInstanceProcessThreadWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Shows whether an app can be cloned to another resource group or
         /// subscription.
         /// </summary>
         /// <remarks>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// Description for Shows whether an app can be cloned to another
+        /// resource group or subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3034,40 +3076,10 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<SiteCloneability>> IsCloneableWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// This is to allow calling via powershell and ARM template.
-        /// </summary>
-        /// <remarks>
-        /// This is to allow calling via powershell and ARM template.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3090,14 +3102,13 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// This is to allow calling via powershell and ARM template.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Description for This is to allow calling via powershell and ARM
+        /// template.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3105,16 +3116,6 @@ public partial interface IWebAppsOperations
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='details'>
-        /// Specify "true" to include metric details in the response. It is
-        /// "false" by default.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only metrics specified in the filter (using OData syntax).
-        /// For example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -3130,12 +3131,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Restores a web app.
         /// </summary>
         /// <remarks>
-        /// Restores a web app.
+        /// Description for Restores a web app.
         /// </remarks>
         /// <param name='subscriptionName'>
         /// Azure subscription.
@@ -3170,8 +3171,8 @@ public partial interface IWebAppsOperations
         /// database.
         /// </summary>
         /// <remarks>
-        /// Migrates a local (in-app) MySql database to a remote MySql
-        /// database.
+        /// Description for Migrates a local (in-app) MySql database to a
+        /// remote MySql database.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3203,8 +3204,8 @@ public partial interface IWebAppsOperations
         /// whether or not MySql in app is enabled
         /// </summary>
         /// <remarks>
-        /// Returns the status of MySql in app migration, if one is active, and
-        /// whether or not MySql in app is enabled
+        /// Description for Returns the status of MySql in app migration, if
+        /// one is active, and whether or not MySql in app is enabled
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3232,7 +3233,7 @@ public partial interface IWebAppsOperations
         /// Gets a Swift Virtual Network connection.
         /// </summary>
         /// <remarks>
-        /// Gets a Swift Virtual Network connection.
+        /// Description for Gets a Swift Virtual Network connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3265,10 +3266,10 @@ public partial interface IWebAppsOperations
         /// in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that
-        /// 1) "swiftSupported" is true when doing a GET against this resource,
-        /// and 2) that the target Subnet has already been delegated, and is
-        /// not
+        /// Description for Integrates this Web App with a Virtual Network.
+        /// This requires that 1) "swiftSupported" is true when doing a GET
+        /// against this resource, and 2) that the target Subnet has already
+        /// been delegated, and is not
         /// in use by another App Service Plan other than the one this App is
         /// in.
         /// </remarks>
@@ -3302,8 +3303,8 @@ public partial interface IWebAppsOperations
         /// deployment slot).
         /// </summary>
         /// <remarks>
-        /// Deletes a Swift Virtual Network connection from an app (or
-        /// deployment slot).
+        /// Description for Deletes a Swift Virtual Network connection from an
+        /// app (or deployment slot).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3317,7 +3318,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -3333,10 +3334,10 @@ public partial interface IWebAppsOperations
         /// in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that
-        /// 1) "swiftSupported" is true when doing a GET against this resource,
-        /// and 2) that the target Subnet has already been delegated, and is
-        /// not
+        /// Description for Integrates this Web App with a Virtual Network.
+        /// This requires that 1) "swiftSupported" is true when doing a GET
+        /// against this resource, and 2) that the target Subnet has already
+        /// been delegated, and is not
         /// in use by another App Service Plan other than the one this App is
         /// in.
         /// </remarks>
@@ -3370,8 +3371,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets all network features used by the app (or deployment slot, if
-        /// specified).
+        /// Description for Gets all network features used by the app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3388,7 +3389,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -3403,8 +3404,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3435,7 +3436,8 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site (To be deprecated).
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site (To be deprecated).
+        /// Description for Start capturing network packets for the site (To be
+        /// deprecated).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3472,7 +3474,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3509,7 +3511,8 @@ public partial interface IWebAppsOperations
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3523,7 +3526,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -3535,8 +3538,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3568,8 +3571,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3601,8 +3604,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3634,8 +3637,8 @@ public partial interface IWebAppsOperations
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Generates a new publishing password for an app (or deployment slot,
-        /// if specified).
+        /// Description for Generates a new publishing password for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3649,7 +3652,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -3660,7 +3663,7 @@ public partial interface IWebAppsOperations
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3694,7 +3697,7 @@ public partial interface IWebAppsOperations
         /// Gets web app's event logs.
         /// </summary>
         /// <remarks>
-        /// Gets web app's event logs.
+        /// Description for Gets web app's event logs.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3722,7 +3725,7 @@ public partial interface IWebAppsOperations
         /// Gets the premier add-ons of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the premier add-ons of an app.
+        /// Description for Gets the premier add-ons of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3750,7 +3753,7 @@ public partial interface IWebAppsOperations
         /// Gets a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a named add-on of an app.
+        /// Description for Gets a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3781,7 +3784,7 @@ public partial interface IWebAppsOperations
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3815,7 +3818,7 @@ public partial interface IWebAppsOperations
         /// Delete a premier add-on from an app.
         /// </summary>
         /// <remarks>
-        /// Delete a premier add-on from an app.
+        /// Description for Delete a premier add-on from an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3832,7 +3835,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -3843,7 +3846,7 @@ public partial interface IWebAppsOperations
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3878,8 +3881,8 @@ public partial interface IWebAppsOperations
         /// Virtual Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Gets data around private site access enablement and authorized
-        /// Virtual Networks that can access the site.
+        /// Description for Gets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3908,8 +3911,8 @@ public partial interface IWebAppsOperations
         /// Virtual Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Sets data around private site access enablement and authorized
-        /// Virtual Networks that can access the site.
+        /// Description for Sets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3941,8 +3944,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3956,7 +3960,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -3971,8 +3975,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3989,7 +3993,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4004,8 +4008,8 @@ public partial interface IWebAppsOperations
         /// or specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot,
-        /// or specific scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4022,7 +4026,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4034,8 +4038,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get a memory dump of a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4052,7 +4056,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4067,8 +4071,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4085,7 +4089,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4100,8 +4104,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4121,7 +4125,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4136,40 +4140,7 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsWithHttpMessagesAsync(string resourceGroupName, string name, string processId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a
+        /// Description for List the threads in a process by its ID for a
         /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -4181,16 +4152,13 @@ public partial interface IWebAppsOperations
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4199,12 +4167,13 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessThreadInfo>> GetProcessThreadWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsWithHttpMessagesAsync(string resourceGroupName, string name, string processId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4233,8 +4202,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named public certificate for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named public certificate for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4265,7 +4234,7 @@ public partial interface IWebAppsOperations
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4300,7 +4269,7 @@ public partial interface IWebAppsOperations
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4317,7 +4286,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4329,8 +4298,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the publishing profile for an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the publishing profile for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4364,8 +4333,8 @@ public partial interface IWebAppsOperations
         /// previously modified by calling the API with POST.
         /// </summary>
         /// <remarks>
-        /// Resets the configuration settings of the current slot if they were
-        /// previously modified by calling the API with POST.
+        /// Description for Resets the configuration settings of the current
+        /// slot if they were previously modified by calling the API with POST.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4379,7 +4348,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4390,7 +4359,7 @@ public partial interface IWebAppsOperations
         /// Restarts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Restarts an app (or deployment slot, if specified).
+        /// Description for Restarts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4413,7 +4382,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4424,7 +4393,8 @@ public partial interface IWebAppsOperations
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure
+        /// Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4441,7 +4411,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4452,7 +4422,7 @@ public partial interface IWebAppsOperations
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4469,7 +4439,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4480,7 +4450,7 @@ public partial interface IWebAppsOperations
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4498,7 +4468,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4509,7 +4479,8 @@ public partial interface IWebAppsOperations
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4523,7 +4494,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4538,8 +4509,8 @@ public partial interface IWebAppsOperations
         /// deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get site extension information by its ID for a web site, or a
-        /// deployment slot.
+        /// Description for Get site extension information by its ID for a web
+        /// site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4556,7 +4527,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4570,7 +4541,8 @@ public partial interface IWebAppsOperations
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4587,7 +4559,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4601,7 +4573,8 @@ public partial interface IWebAppsOperations
         /// Remove a site extension from a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Remove a site extension from a web site, or a deployment slot.
+        /// Description for Remove a site extension from a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4618,7 +4591,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4626,10 +4599,40 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse> DeleteSiteExtensionWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets an app's deployment slots.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot
+        /// of an app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config
+        /// properties to override the source slot config. See example.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse> CopyProductionSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
         /// Gets an app's deployment slots.
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets an app's deployment slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4657,7 +4660,7 @@ public partial interface IWebAppsOperations
         /// Gets the details of a web, mobile, or API app.
         /// </summary>
         /// <remarks>
-        /// Gets the details of a web, mobile, or API app.
+        /// Description for Gets the details of a web, mobile, or API app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4675,7 +4678,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -4690,8 +4693,8 @@ public partial interface IWebAppsOperations
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4727,7 +4730,8 @@ public partial interface IWebAppsOperations
         /// Deletes a web, mobile, or API app, or one of the deployment slots.
         /// </summary>
         /// <remarks>
-        /// Deletes a web, mobile, or API app, or one of the deployment slots.
+        /// Description for Deletes a web, mobile, or API app, or one of the
+        /// deployment slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4753,7 +4757,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4765,8 +4769,8 @@ public partial interface IWebAppsOperations
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4802,7 +4806,7 @@ public partial interface IWebAppsOperations
         /// Analyze a custom hostname.
         /// </summary>
         /// <remarks>
-        /// Analyze a custom hostname.
+        /// Description for Analyze a custom hostname.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4838,8 +4842,8 @@ public partial interface IWebAppsOperations
         /// current slot.
         /// </summary>
         /// <remarks>
-        /// Applies the configuration settings from the target slot onto the
-        /// current slot.
+        /// Description for Applies the configuration settings from the target
+        /// slot onto the current slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4860,7 +4864,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -4871,7 +4875,7 @@ public partial interface IWebAppsOperations
         /// Creates a backup of an app.
         /// </summary>
         /// <remarks>
-        /// Creates a backup of an app.
+        /// Description for Creates a backup of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4907,7 +4911,7 @@ public partial interface IWebAppsOperations
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4939,7 +4943,7 @@ public partial interface IWebAppsOperations
         /// Gets a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Gets a backup of an app by its ID.
+        /// Description for Gets a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4974,7 +4978,7 @@ public partial interface IWebAppsOperations
         /// Deletes a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Deletes a backup of an app by its ID.
+        /// Description for Deletes a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4995,7 +4999,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -5009,10 +5013,10 @@ public partial interface IWebAppsOperations
         /// URL is passed in the request body.
         /// </summary>
         /// <remarks>
-        /// Gets status of a web app backup that may be in progress, including
-        /// secrets associated with the backup, such as the Azure Storage SAS
-        /// URL. Also can be used to update the SAS URL for the backup if a new
-        /// URL is passed in the request body.
+        /// Description for Gets status of a web app backup that may be in
+        /// progress, including secrets associated with the backup, such as the
+        /// Azure Storage SAS URL. Also can be used to update the SAS URL for
+        /// the backup if a new URL is passed in the request body.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5051,8 +5055,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5076,7 +5080,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -5087,7 +5091,7 @@ public partial interface IWebAppsOperations
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5119,7 +5123,7 @@ public partial interface IWebAppsOperations
         /// Replaces the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the application settings of an app.
+        /// Description for Replaces the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5154,7 +5158,7 @@ public partial interface IWebAppsOperations
         /// Gets the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the application settings of an app.
+        /// Description for Gets the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5187,8 +5191,8 @@ public partial interface IWebAppsOperations
         /// web app.
         /// </summary>
         /// <remarks>
-        /// Updates the Authentication / Authorization settings associated with
-        /// web app.
+        /// Description for Updates the Authentication / Authorization settings
+        /// associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5223,7 +5227,8 @@ public partial interface IWebAppsOperations
         /// Gets the Authentication/Authorization settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Authentication/Authorization settings of an app.
+        /// Description for Gets the Authentication/Authorization settings of
+        /// an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5255,7 +5260,8 @@ public partial interface IWebAppsOperations
         /// Updates the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the Azure storage account configurations of an app.
+        /// Description for Updates the Azure storage account configurations of
+        /// an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5291,7 +5297,8 @@ public partial interface IWebAppsOperations
         /// Gets the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Azure storage account configurations of an app.
+        /// Description for Gets the Azure storage account configurations of an
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5324,7 +5331,7 @@ public partial interface IWebAppsOperations
         /// Updates the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the backup configuration of an app.
+        /// Description for Updates the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5359,7 +5366,7 @@ public partial interface IWebAppsOperations
         /// Deletes the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the backup configuration of an app.
+        /// Description for Deletes the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5377,7 +5384,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -5388,7 +5395,7 @@ public partial interface IWebAppsOperations
         /// Gets the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the backup configuration of an app.
+        /// Description for Gets the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5420,7 +5427,7 @@ public partial interface IWebAppsOperations
         /// Replaces the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the connection strings of an app.
+        /// Description for Replaces the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5455,7 +5462,7 @@ public partial interface IWebAppsOperations
         /// Gets the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the connection strings of an app.
+        /// Description for Gets the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5487,7 +5494,7 @@ public partial interface IWebAppsOperations
         /// Gets the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the logging configuration of an app.
+        /// Description for Gets the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5519,7 +5526,7 @@ public partial interface IWebAppsOperations
         /// Updates the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the logging configuration of an app.
+        /// Description for Updates the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5555,7 +5562,7 @@ public partial interface IWebAppsOperations
         /// Replaces the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the metadata of an app.
+        /// Description for Replaces the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5590,7 +5597,7 @@ public partial interface IWebAppsOperations
         /// Gets the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the metadata of an app.
+        /// Description for Gets the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5622,7 +5629,7 @@ public partial interface IWebAppsOperations
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5654,7 +5661,7 @@ public partial interface IWebAppsOperations
         /// Updates the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Updates the Push settings associated with web app.
+        /// Description for Updates the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5689,7 +5696,7 @@ public partial interface IWebAppsOperations
         /// Gets the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Gets the Push settings associated with web app.
+        /// Description for Gets the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5722,8 +5729,9 @@ public partial interface IWebAppsOperations
         /// bitness, default documents, virtual applications, Always On, etc.
         /// </summary>
         /// <remarks>
-        /// Gets the configuration of an app, such as platform version and
-        /// bitness, default documents, virtual applications, Always On, etc.
+        /// Description for Gets the configuration of an app, such as platform
+        /// version and bitness, default documents, virtual applications,
+        /// Always On, etc.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5755,7 +5763,7 @@ public partial interface IWebAppsOperations
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5790,7 +5798,7 @@ public partial interface IWebAppsOperations
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5827,9 +5835,9 @@ public partial interface IWebAppsOperations
         /// snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each
-        /// element of the list contains a timestamp and the ID of the
-        /// snapshot.
+        /// Description for Gets a list of web app configuration snapshots
+        /// identifiers. Each element of the list contains a timestamp and the
+        /// ID of the snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5862,8 +5870,8 @@ public partial interface IWebAppsOperations
         /// in time.
         /// </summary>
         /// <remarks>
-        /// Gets a snapshot of the configuration of an app at a previous point
-        /// in time.
+        /// Description for Gets a snapshot of the configuration of an app at a
+        /// previous point in time.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5898,7 +5906,8 @@ public partial interface IWebAppsOperations
         /// Reverts the configuration of an app to a previous snapshot.
         /// </summary>
         /// <remarks>
-        /// Reverts the configuration of an app to a previous snapshot.
+        /// Description for Reverts the configuration of an app to a previous
+        /// snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5919,7 +5928,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -5930,7 +5939,8 @@ public partial interface IWebAppsOperations
         /// Gets the last lines of docker logs for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the last lines of docker logs for the given site
+        /// Description for Gets the last lines of docker logs for the given
+        /// site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5962,7 +5972,8 @@ public partial interface IWebAppsOperations
         /// Gets the ZIP archived docker log files for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the ZIP archived docker log files for the given site
+        /// Description for Gets the ZIP archived docker log files for the
+        /// given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5994,7 +6005,8 @@ public partial interface IWebAppsOperations
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6027,8 +6039,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a continuous web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Gets a continuous web job by its ID for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6049,7 +6061,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -6064,8 +6076,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Delete a continuous web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Delete a continuous web job by its ID for an app,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6086,7 +6098,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6097,7 +6109,8 @@ public partial interface IWebAppsOperations
         /// Start a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Start a continuous web job for an app, or a deployment slot.
+        /// Description for Start a continuous web job for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6118,7 +6131,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6129,7 +6142,8 @@ public partial interface IWebAppsOperations
         /// Stop a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Stop a continuous web job for an app, or a deployment slot.
+        /// Description for Stop a continuous web job for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6150,7 +6164,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6161,7 +6175,7 @@ public partial interface IWebAppsOperations
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6193,7 +6207,8 @@ public partial interface IWebAppsOperations
         /// Get a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get a deployment by its ID for an app, or a deployment slot.
+        /// Description for Get a deployment by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6228,7 +6243,8 @@ public partial interface IWebAppsOperations
         /// Create a deployment for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create a deployment for an app, or a deployment slot.
+        /// Description for Create a deployment for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6266,7 +6282,8 @@ public partial interface IWebAppsOperations
         /// Delete a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a deployment by its ID for an app, or a deployment slot.
+        /// Description for Delete a deployment by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6287,7 +6304,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6299,8 +6316,8 @@ public partial interface IWebAppsOperations
         /// deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployment log for specific deployment for an app, or a
-        /// deployment slot.
+        /// Description for List deployment log for specific deployment for an
+        /// app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6339,9 +6356,9 @@ public partial interface IWebAppsOperations
         /// stored in a backup.
         /// </summary>
         /// <remarks>
-        /// Discovers an existing app backup that can be restored from a blob
-        /// in Azure storage. Use this to get information about the databases
-        /// stored in a backup.
+        /// Description for Discovers an existing app backup that can be
+        /// restored from a blob in Azure storage. Use this to get information
+        /// about the databases stored in a backup.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6377,7 +6394,8 @@ public partial interface IWebAppsOperations
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated
+        /// with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6409,7 +6427,7 @@ public partial interface IWebAppsOperations
         /// Get domain ownership identifier for web app.
         /// </summary>
         /// <remarks>
-        /// Get domain ownership identifier for web app.
+        /// Description for Get domain ownership identifier for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6445,8 +6463,8 @@ public partial interface IWebAppsOperations
         /// existing ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an
-        /// existing ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app,
+        /// or updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6484,7 +6502,8 @@ public partial interface IWebAppsOperations
         /// Deletes a domain ownership identifier for a web app.
         /// </summary>
         /// <remarks>
-        /// Deletes a domain ownership identifier for a web app.
+        /// Description for Deletes a domain ownership identifier for a web
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6505,7 +6524,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6517,8 +6536,8 @@ public partial interface IWebAppsOperations
         /// existing ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an
-        /// existing ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app,
+        /// or updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6556,7 +6575,7 @@ public partial interface IWebAppsOperations
         /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6588,7 +6607,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6609,7 +6628,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -6623,7 +6642,8 @@ public partial interface IWebAppsOperations
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy
+        /// operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6641,7 +6661,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -6655,7 +6675,8 @@ public partial interface IWebAppsOperations
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6664,8 +6685,7 @@ public partial interface IWebAppsOperations
         /// Site name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -6673,7 +6693,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -6687,7 +6707,8 @@ public partial interface IWebAppsOperations
         /// Fetch a short lived token that can be exchanged for a master key.
         /// </summary>
         /// <remarks>
-        /// Fetch a short lived token that can be exchanged for a master key.
+        /// Description for Fetch a short lived token that can be exchanged for
+        /// a master key.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6720,8 +6741,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get function information by its ID for web site, or a deployment
-        /// slot.
+        /// Description for Get function information by its ID for web site, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6733,8 +6754,7 @@ public partial interface IWebAppsOperations
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -6742,7 +6762,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -6756,7 +6776,7 @@ public partial interface IWebAppsOperations
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6768,8 +6788,7 @@ public partial interface IWebAppsOperations
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='functionEnvelope'>
         /// Function details.
@@ -6794,7 +6813,8 @@ public partial interface IWebAppsOperations
         /// Delete a function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a function for web site, or a deployment slot.
+        /// Description for Delete a function for web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6806,8 +6826,7 @@ public partial interface IWebAppsOperations
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -6815,7 +6834,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -6827,8 +6846,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get function secrets for a function in a web site, or a deployment
-        /// slot.
+        /// Description for Get function secrets for a function in a web site,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6840,8 +6859,7 @@ public partial interface IWebAppsOperations
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -6863,7 +6881,8 @@ public partial interface IWebAppsOperations
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6896,8 +6915,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named hostname binding for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named hostname binding for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6932,7 +6951,7 @@ public partial interface IWebAppsOperations
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6971,7 +6990,7 @@ public partial interface IWebAppsOperations
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6992,7 +7011,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -7004,8 +7023,8 @@ public partial interface IWebAppsOperations
         /// App.
         /// </summary>
         /// <remarks>
-        /// Retrieves a specific Service Bus Hybrid Connection used by this Web
-        /// App.
+        /// Description for Retrieves a specific Service Bus Hybrid Connection
+        /// used by this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7042,7 +7061,8 @@ public partial interface IWebAppsOperations
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus
+        /// relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7082,7 +7102,7 @@ public partial interface IWebAppsOperations
         /// Removes a Hybrid Connection from this site.
         /// </summary>
         /// <remarks>
-        /// Removes a Hybrid Connection from this site.
+        /// Description for Removes a Hybrid Connection from this site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7105,7 +7125,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -7116,7 +7136,8 @@ public partial interface IWebAppsOperations
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus
+        /// relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7153,47 +7174,11 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<HybridConnection>> UpdateHybridConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, HybridConnection connectionEnvelope, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </summary>
-        /// <remarks>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='namespaceName'>
-        /// The namespace for this hybrid connection.
-        /// </param>
-        /// <param name='relayName'>
-        /// The relay name for this hybrid connection.
-        /// </param>
-        /// <param name='slot'>
-        /// The name of the slot for the web app.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<HybridConnectionKey>> ListHybridConnectionKeysSlotWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
         /// Retrieves all Service Bus Hybrid Connections used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+        /// Description for Retrieves all Service Bus Hybrid Connections used
+        /// by this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7225,8 +7210,8 @@ public partial interface IWebAppsOperations
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets hybrid connections configured for an app (or deployment slot,
-        /// if specified).
+        /// Description for Gets hybrid connections configured for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7258,7 +7243,7 @@ public partial interface IWebAppsOperations
         /// Gets a hybrid connection configuration by its name.
         /// </summary>
         /// <remarks>
-        /// Gets a hybrid connection configuration by its name.
+        /// Description for Gets a hybrid connection configuration by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7294,8 +7279,8 @@ public partial interface IWebAppsOperations
         /// existing one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an
-        /// existing one (PATCH).
+        /// Description for Creates a new hybrid connection configuration
+        /// (PUT), or updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7333,7 +7318,7 @@ public partial interface IWebAppsOperations
         /// Deletes a relay service connection by its name.
         /// </summary>
         /// <remarks>
-        /// Deletes a relay service connection by its name.
+        /// Description for Deletes a relay service connection by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7354,7 +7339,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -7366,8 +7351,8 @@ public partial interface IWebAppsOperations
         /// existing one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an
-        /// existing one (PATCH).
+        /// Description for Creates a new hybrid connection configuration
+        /// (PUT), or updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7405,7 +7390,7 @@ public partial interface IWebAppsOperations
         /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7434,23 +7419,22 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the status of the last MSDeploy operation.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of web app slot. If not specified then will default to
-        /// production slot.
+        /// Name of the app.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of web app instance.
+        /// </param>
+        /// <param name='slot'>
+        /// Name of the deployment slot. If a slot is not specified, the API
+        /// gets the production slot instances.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -7467,12 +7451,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<WebSiteInstanceStatus>> GetInstanceInfoSlotWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Invoke the MSDeploy web app extension.
+        /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7487,16 +7471,13 @@ public partial interface IWebAppsOperations
         /// <param name='instanceId'>
         /// ID of web app instance.
         /// </param>
-        /// <param name='mSDeploy'>
-        /// Details of MSDeploy operation
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7505,12 +7486,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<MSDeployStatus>> CreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, MSDeploy mSDeploy, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7525,13 +7506,16 @@ public partial interface IWebAppsOperations
         /// <param name='instanceId'>
         /// ID of web app instance.
         /// </param>
+        /// <param name='mSDeploy'>
+        /// Details of MSDeploy operation
+        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7540,29 +7524,26 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<MSDeployLog>> GetInstanceMSDeployLogSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<MSDeployStatus>> CreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, MSDeploy mSDeploy, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get the MSDeploy Log for the last MSDeploy
+        /// operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Site name.
+        /// Name of web app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// returns deployments for the production slot.
+        /// Name of web app slot. If not specified then will default to
+        /// production slot.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET
-        /// api/sites/{siteName}/instances".
+        /// ID of web app instance.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -7570,7 +7551,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7579,14 +7560,15 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<MSDeployLog>> GetInstanceMSDeployLogSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Get list of processes for a web site, or a deployment slot, or for
+        /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7594,9 +7576,6 @@ public partial interface IWebAppsOperations
         /// <param name='name'>
         /// Site name.
         /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
         /// returns deployments for the production slot.
@@ -7612,7 +7591,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7621,53 +7600,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessInfo>> GetInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Terminate a process by its ID for a web site, or a deployment slot,
-        /// or specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot,
-        /// or specific scaled-out instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// returns deployments for the production slot.
-        /// </param>
-        /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET
-        /// api/sites/{siteName}/instances".
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse> DeleteInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get a memory dump of a process by its ID for a specific scaled-out
+        /// Get process information by its ID for a specific scaled-out
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7693,7 +7633,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7702,14 +7642,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Stream>> GetInstanceProcessDumpSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ProcessInfo>> GetInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Terminate a process by its ID for a web site, or a deployment slot,
+        /// or specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7735,23 +7675,20 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse> DeleteInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get process information by its ID for a specific scaled-out
+        /// Get a memory dump of a process by its ID for a specific scaled-out
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get a memory dump of a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7762,9 +7699,6 @@ public partial interface IWebAppsOperations
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='baseAddress'>
-        /// Module base address.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
         /// returns deployments for the production slot.
@@ -7780,7 +7714,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7789,14 +7723,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessModuleInfo>> GetInstanceProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Stream>> GetInstanceProcessDumpSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// List module information for a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7822,7 +7756,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7831,14 +7765,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a
-        /// specific scaled-out instance in a web site.
+        /// Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7849,8 +7783,8 @@ public partial interface IWebAppsOperations
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
+        /// <param name='baseAddress'>
+        /// Module base address.
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
@@ -7867,7 +7801,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -7876,24 +7810,32 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessThreadInfo>> GetInstanceProcessThreadSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ProcessModuleInfo>> GetInstanceProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// List the threads in a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// Description for List the threads in a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
+        /// Site name.
+        /// </param>
+        /// <param name='processId'>
+        /// PID.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. By default, this API returns
-        /// information on the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API
+        /// returns deployments for the production slot.
+        /// </param>
+        /// <param name='instanceId'>
+        /// ID of a specific scaled-out instance. This is the value of the name
+        /// property in the JSON response from "GET
+        /// api/sites/{siteName}/instances".
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -7910,12 +7852,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<SiteCloneability>> IsCloneableSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// This is to allow calling via powershell and ARM template.
+        /// Shows whether an app can be cloned to another resource group or
+        /// subscription.
         /// </summary>
         /// <remarks>
-        /// This is to allow calling via powershell and ARM template.
+        /// Description for Shows whether an app can be cloned to another
+        /// resource group or subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7924,8 +7868,8 @@ public partial interface IWebAppsOperations
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// will restore a backup of the production slot.
+        /// Name of the deployment slot. By default, this API returns
+        /// information on the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -7942,14 +7886,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<SiteCloneability>> IsCloneableSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7959,7 +7901,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// will get metric definitions of the production slot.
+        /// will get backups of the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -7976,14 +7918,13 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// This is to allow calling via powershell and ARM template.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Description for This is to allow calling via powershell and ARM
+        /// template.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7992,18 +7933,7 @@ public partial interface IWebAppsOperations
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// will get metrics of the production slot.
-        /// </param>
-        /// <param name='details'>
-        /// Specify "true" to include metric details in the response. It is
-        /// "false" by default.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only metrics specified in the filter (using OData syntax).
-        /// For example: $filter=(name.value eq 'Metric1' or name.value eq
-        /// 'Metric2') and startTime eq 2014-01-01T00:00:00Z and endTime eq
-        /// 2014-12-31T23:59:59Z and timeGrain eq duration'[Hour|Minute|Day]'.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -8020,14 +7950,14 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Returns the status of MySql in app migration, if one is active, and
         /// whether or not MySql in app is enabled
         /// </summary>
         /// <remarks>
-        /// Returns the status of MySql in app migration, if one is active, and
-        /// whether or not MySql in app is enabled
+        /// Description for Returns the status of MySql in app migration, if
+        /// one is active, and whether or not MySql in app is enabled
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8058,7 +7988,7 @@ public partial interface IWebAppsOperations
         /// Gets a Swift Virtual Network connection.
         /// </summary>
         /// <remarks>
-        /// Gets a Swift Virtual Network connection.
+        /// Description for Gets a Swift Virtual Network connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8095,10 +8025,10 @@ public partial interface IWebAppsOperations
         /// in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that
-        /// 1) "swiftSupported" is true when doing a GET against this resource,
-        /// and 2) that the target Subnet has already been delegated, and is
-        /// not
+        /// Description for Integrates this Web App with a Virtual Network.
+        /// This requires that 1) "swiftSupported" is true when doing a GET
+        /// against this resource, and 2) that the target Subnet has already
+        /// been delegated, and is not
         /// in use by another App Service Plan other than the one this App is
         /// in.
         /// </remarks>
@@ -8136,8 +8066,8 @@ public partial interface IWebAppsOperations
         /// deployment slot).
         /// </summary>
         /// <remarks>
-        /// Deletes a Swift Virtual Network connection from an app (or
-        /// deployment slot).
+        /// Description for Deletes a Swift Virtual Network connection from an
+        /// app (or deployment slot).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8155,7 +8085,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -8171,10 +8101,10 @@ public partial interface IWebAppsOperations
         /// in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that
-        /// 1) "swiftSupported" is true when doing a GET against this resource,
-        /// and 2) that the target Subnet has already been delegated, and is
-        /// not
+        /// Description for Integrates this Web App with a Virtual Network.
+        /// This requires that 1) "swiftSupported" is true when doing a GET
+        /// against this resource, and 2) that the target Subnet has already
+        /// been delegated, and is not
         /// in use by another App Service Plan other than the one this App is
         /// in.
         /// </remarks>
@@ -8212,8 +8142,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets all network features used by the app (or deployment slot, if
-        /// specified).
+        /// Description for Gets all network features used by the app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8234,7 +8164,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -8249,8 +8179,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8285,7 +8215,8 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site (To be deprecated).
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site (To be deprecated).
+        /// Description for Start capturing network packets for the site (To be
+        /// deprecated).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8325,7 +8256,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8365,7 +8296,8 @@ public partial interface IWebAppsOperations
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8382,7 +8314,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -8394,8 +8326,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8431,8 +8363,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8468,8 +8400,8 @@ public partial interface IWebAppsOperations
         /// slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment
-        /// slot, if specified).
+        /// Description for Gets a named operation for a network trace
+        /// capturing (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8505,8 +8437,8 @@ public partial interface IWebAppsOperations
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Generates a new publishing password for an app (or deployment slot,
-        /// if specified).
+        /// Description for Generates a new publishing password for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8524,7 +8456,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -8535,7 +8467,7 @@ public partial interface IWebAppsOperations
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8573,7 +8505,7 @@ public partial interface IWebAppsOperations
         /// Gets web app's event logs.
         /// </summary>
         /// <remarks>
-        /// Gets web app's event logs.
+        /// Description for Gets web app's event logs.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8605,7 +8537,7 @@ public partial interface IWebAppsOperations
         /// Gets the premier add-ons of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the premier add-ons of an app.
+        /// Description for Gets the premier add-ons of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8637,7 +8569,7 @@ public partial interface IWebAppsOperations
         /// Gets a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a named add-on of an app.
+        /// Description for Gets a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8672,7 +8604,7 @@ public partial interface IWebAppsOperations
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8710,7 +8642,7 @@ public partial interface IWebAppsOperations
         /// Delete a premier add-on from an app.
         /// </summary>
         /// <remarks>
-        /// Delete a premier add-on from an app.
+        /// Description for Delete a premier add-on from an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8731,7 +8663,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -8742,7 +8674,7 @@ public partial interface IWebAppsOperations
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8781,8 +8713,8 @@ public partial interface IWebAppsOperations
         /// Virtual Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Gets data around private site access enablement and authorized
-        /// Virtual Networks that can access the site.
+        /// Description for Gets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8814,8 +8746,8 @@ public partial interface IWebAppsOperations
         /// Virtual Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Sets data around private site access enablement and authorized
-        /// Virtual Networks that can access the site.
+        /// Description for Sets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8850,8 +8782,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8869,7 +8802,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -8884,8 +8817,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8906,7 +8839,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -8921,8 +8854,8 @@ public partial interface IWebAppsOperations
         /// or specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot,
-        /// or specific scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8943,7 +8876,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -8955,8 +8888,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get a memory dump of a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8977,7 +8910,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -8992,8 +8925,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9014,7 +8947,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -9029,8 +8962,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Get process information by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9054,7 +8987,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -9069,44 +9002,7 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// returns deployments for the production slot.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a
+        /// Description for List the threads in a process by its ID for a
         /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -9118,9 +9014,6 @@ public partial interface IWebAppsOperations
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
         /// returns deployments for the production slot.
@@ -9131,7 +9024,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -9140,12 +9033,13 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProcessThreadInfo>> GetProcessThreadSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9178,8 +9072,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named public certificate for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named public certificate for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9214,7 +9108,7 @@ public partial interface IWebAppsOperations
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9253,7 +9147,7 @@ public partial interface IWebAppsOperations
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9274,7 +9168,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9286,8 +9180,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the publishing profile for an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the publishing profile for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9325,8 +9219,8 @@ public partial interface IWebAppsOperations
         /// previously modified by calling the API with POST.
         /// </summary>
         /// <remarks>
-        /// Resets the configuration settings of the current slot if they were
-        /// previously modified by calling the API with POST.
+        /// Description for Resets the configuration settings of the current
+        /// slot if they were previously modified by calling the API with POST.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9344,7 +9238,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9355,7 +9249,7 @@ public partial interface IWebAppsOperations
         /// Restarts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Restarts an app (or deployment slot, if specified).
+        /// Description for Restarts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9382,7 +9276,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9393,7 +9287,8 @@ public partial interface IWebAppsOperations
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure
+        /// Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9414,7 +9309,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9425,7 +9320,7 @@ public partial interface IWebAppsOperations
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9446,7 +9341,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9457,7 +9352,7 @@ public partial interface IWebAppsOperations
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9479,7 +9374,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9490,7 +9385,8 @@ public partial interface IWebAppsOperations
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9500,7 +9396,44 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse<IPage<SiteExtensionInfo>>> ListSiteExtensionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Get site extension information by its ID for a web site, or a
+        /// deployment slot.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get site extension information by its ID for a web
+        /// site, or a deployment slot.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Site name.
+        /// </param>
+        /// <param name='siteExtensionId'>
+        /// Site extension name.
+        /// </param>
+        /// <param name='slot'>
+        /// Name of the deployment slot. If a slot is not specified, the API
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -9508,7 +9441,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -9517,13 +9450,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<SiteExtensionInfo>>> ListSiteExtensionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<SiteExtensionInfo>> GetSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get site extension information by its ID for a web site, or a
-        /// deployment slot.
+        /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get site extension information by its ID for a web site, or a
+        /// Description for Install site extension on a web site, or a
         /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -9537,7 +9469,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -9545,7 +9477,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -9554,12 +9486,13 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<SiteExtensionInfo>> GetSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<SiteExtensionInfo>> InstallSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Remove a site extension from a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Remove a site extension from a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9580,34 +9513,33 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<SiteExtensionInfo>> InstallSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse> DeleteSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Remove a site extension from a web site, or a deployment slot.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
-        /// Remove a site extension from a web site, or a deployment slot.
+        /// Description for Copies a deployment slot to another deployment slot
+        /// of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Site name.
+        /// Name of the app.
         /// </param>
-        /// <param name='siteExtensionId'>
-        /// Site extension name.
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config
+        /// properties to override the source slot config. See example.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the source slot. If a slot is not specified, the production
+        /// slot is used as the source slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -9615,20 +9547,20 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse> DeleteSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse> CopySlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get the difference in configuration settings between two web app
         /// slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app
-        /// slots.
+        /// Description for Get the difference in configuration settings
+        /// between two web app slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9663,7 +9595,7 @@ public partial interface IWebAppsOperations
         /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9684,7 +9616,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9695,7 +9627,7 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9726,7 +9658,8 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9757,7 +9690,7 @@ public partial interface IWebAppsOperations
         /// Gets the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the source control configuration of an app.
+        /// Description for Gets the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9789,7 +9722,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9825,7 +9758,7 @@ public partial interface IWebAppsOperations
         /// Deletes the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the source control configuration of an app.
+        /// Description for Deletes the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9844,7 +9777,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9855,7 +9788,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9891,7 +9824,7 @@ public partial interface IWebAppsOperations
         /// Starts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Starts an app (or deployment slot, if specified).
+        /// Description for Starts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9909,7 +9842,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9920,7 +9853,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9960,7 +9893,7 @@ public partial interface IWebAppsOperations
         /// Stops an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Stops an app (or deployment slot, if specified).
+        /// Description for Stops an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9978,7 +9911,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -9989,7 +9922,8 @@ public partial interface IWebAppsOperations
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10006,7 +9940,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10017,7 +9951,7 @@ public partial interface IWebAppsOperations
         /// Sync web app repository.
         /// </summary>
         /// <remarks>
-        /// Sync web app repository.
+        /// Description for Sync web app repository.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10035,7 +9969,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10046,7 +9980,8 @@ public partial interface IWebAppsOperations
         /// Syncs function trigger metadata to the scale controller
         /// </summary>
         /// <remarks>
-        /// Syncs function trigger metadata to the scale controller
+        /// Description for Syncs function trigger metadata to the scale
+        /// controller
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10055,8 +9990,7 @@ public partial interface IWebAppsOperations
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// will restore a backup of the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10064,7 +9998,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10075,7 +10009,8 @@ public partial interface IWebAppsOperations
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10108,8 +10043,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Gets a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10122,7 +10057,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10130,7 +10065,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -10145,8 +10080,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Delete a triggered web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Delete a triggered web job by its ID for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10159,7 +10094,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// deletes web job for the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10167,7 +10102,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10179,8 +10114,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment
-        /// slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10193,7 +10128,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10201,7 +10136,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -10216,8 +10151,8 @@ public partial interface IWebAppsOperations
         /// deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job's history by its ID for an app, , or a
-        /// deployment slot.
+        /// Description for Gets a triggered web job's history by its ID for an
+        /// app, , or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10233,7 +10168,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10241,7 +10176,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -10255,7 +10190,8 @@ public partial interface IWebAppsOperations
         /// Run a triggered web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Run a triggered web job for an app, or a deployment slot.
+        /// Description for Run a triggered web job for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10268,7 +10204,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -10276,7 +10212,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10288,8 +10224,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10329,8 +10265,8 @@ public partial interface IWebAppsOperations
         /// to.
         /// </summary>
         /// <remarks>
-        /// Gets the virtual networks the app (or deployment slot) is connected
-        /// to.
+        /// Description for Gets the virtual networks the app (or deployment
+        /// slot) is connected to.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10363,8 +10299,8 @@ public partial interface IWebAppsOperations
         /// by name.
         /// </summary>
         /// <remarks>
-        /// Gets a virtual network the app (or deployment slot) is connected to
-        /// by name.
+        /// Description for Gets a virtual network the app (or deployment slot)
+        /// is connected to by name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10400,8 +10336,8 @@ public partial interface IWebAppsOperations
         /// updates the connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or
-        /// updates the connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot
+        /// (PUT) or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10440,8 +10376,8 @@ public partial interface IWebAppsOperations
         /// virtual network.
         /// </summary>
         /// <remarks>
-        /// Deletes a connection from an app (or deployment slot to a named
-        /// virtual network.
+        /// Description for Deletes a connection from an app (or deployment
+        /// slot to a named virtual network.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10462,7 +10398,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10474,8 +10410,8 @@ public partial interface IWebAppsOperations
         /// updates the connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or
-        /// updates the connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot
+        /// (PUT) or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10513,7 +10449,7 @@ public partial interface IWebAppsOperations
         /// Gets an app's Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Gets an app's Virtual Network gateway.
+        /// Description for Gets an app's Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10538,7 +10474,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -10553,8 +10489,8 @@ public partial interface IWebAppsOperations
         /// (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it
-        /// (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT)
+        /// or updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10598,8 +10534,8 @@ public partial interface IWebAppsOperations
         /// (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it
-        /// (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT)
+        /// or updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10642,7 +10578,7 @@ public partial interface IWebAppsOperations
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10674,7 +10610,8 @@ public partial interface IWebAppsOperations
         /// Get webjob information for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get webjob information for an app, or a deployment slot.
+        /// Description for Get webjob information for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10710,8 +10647,8 @@ public partial interface IWebAppsOperations
         /// slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app
-        /// slots.
+        /// Description for Get the difference in configuration settings
+        /// between two web app slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10742,7 +10679,7 @@ public partial interface IWebAppsOperations
         /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10759,7 +10696,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10770,7 +10707,7 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10798,7 +10735,8 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10826,7 +10764,7 @@ public partial interface IWebAppsOperations
         /// Gets the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the source control configuration of an app.
+        /// Description for Gets the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10854,7 +10792,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10885,7 +10823,7 @@ public partial interface IWebAppsOperations
         /// Deletes the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the source control configuration of an app.
+        /// Description for Deletes the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10899,7 +10837,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10910,7 +10848,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10941,7 +10879,7 @@ public partial interface IWebAppsOperations
         /// Starts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Starts an app (or deployment slot, if specified).
+        /// Description for Starts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10955,7 +10893,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -10966,7 +10904,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11003,7 +10941,7 @@ public partial interface IWebAppsOperations
         /// Stops an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Stops an app (or deployment slot, if specified).
+        /// Description for Stops an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11017,7 +10955,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11028,7 +10966,8 @@ public partial interface IWebAppsOperations
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the
+        /// site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11042,7 +10981,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11053,7 +10992,7 @@ public partial interface IWebAppsOperations
         /// Sync web app repository.
         /// </summary>
         /// <remarks>
-        /// Sync web app repository.
+        /// Description for Sync web app repository.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11067,7 +11006,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11078,7 +11017,8 @@ public partial interface IWebAppsOperations
         /// Syncs function trigger metadata to the scale controller
         /// </summary>
         /// <remarks>
-        /// Syncs function trigger metadata to the scale controller
+        /// Description for Syncs function trigger metadata to the scale
+        /// controller
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11092,7 +11032,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11103,7 +11043,8 @@ public partial interface IWebAppsOperations
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11132,8 +11073,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Gets a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11150,7 +11091,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11165,8 +11106,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Delete a triggered web job by its ID for an app, or a deployment
-        /// slot.
+        /// Description for Delete a triggered web job by its ID for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11183,7 +11124,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11195,8 +11136,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment
-        /// slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11213,7 +11154,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11228,8 +11169,8 @@ public partial interface IWebAppsOperations
         /// deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job's history by its ID for an app, , or a
-        /// deployment slot.
+        /// Description for Gets a triggered web job's history by its ID for an
+        /// app, , or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11249,7 +11190,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11263,7 +11204,8 @@ public partial interface IWebAppsOperations
         /// Run a triggered web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Run a triggered web job for an app, or a deployment slot.
+        /// Description for Run a triggered web job for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11280,7 +11222,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11292,8 +11234,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11329,8 +11271,8 @@ public partial interface IWebAppsOperations
         /// to.
         /// </summary>
         /// <remarks>
-        /// Gets the virtual networks the app (or deployment slot) is connected
-        /// to.
+        /// Description for Gets the virtual networks the app (or deployment
+        /// slot) is connected to.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11359,8 +11301,8 @@ public partial interface IWebAppsOperations
         /// by name.
         /// </summary>
         /// <remarks>
-        /// Gets a virtual network the app (or deployment slot) is connected to
-        /// by name.
+        /// Description for Gets a virtual network the app (or deployment slot)
+        /// is connected to by name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11392,8 +11334,8 @@ public partial interface IWebAppsOperations
         /// updates the connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or
-        /// updates the connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot
+        /// (PUT) or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11428,8 +11370,8 @@ public partial interface IWebAppsOperations
         /// virtual network.
         /// </summary>
         /// <remarks>
-        /// Deletes a connection from an app (or deployment slot to a named
-        /// virtual network.
+        /// Description for Deletes a connection from an app (or deployment
+        /// slot to a named virtual network.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11446,7 +11388,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11458,8 +11400,8 @@ public partial interface IWebAppsOperations
         /// updates the connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or
-        /// updates the connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot
+        /// (PUT) or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11493,7 +11435,7 @@ public partial interface IWebAppsOperations
         /// Gets an app's Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Gets an app's Virtual Network gateway.
+        /// Description for Gets an app's Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11514,7 +11456,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11529,8 +11471,8 @@ public partial interface IWebAppsOperations
         /// (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it
-        /// (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT)
+        /// or updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11569,8 +11511,8 @@ public partial interface IWebAppsOperations
         /// (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it
-        /// (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT)
+        /// or updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11608,7 +11550,7 @@ public partial interface IWebAppsOperations
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11636,7 +11578,8 @@ public partial interface IWebAppsOperations
         /// Get webjob information for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get webjob information for an app, or a deployment slot.
+        /// Description for Get webjob information for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11668,8 +11611,8 @@ public partial interface IWebAppsOperations
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11702,8 +11645,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11723,7 +11666,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11734,7 +11677,7 @@ public partial interface IWebAppsOperations
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11762,7 +11705,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11779,7 +11722,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11793,7 +11736,7 @@ public partial interface IWebAppsOperations
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11827,7 +11770,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11847,7 +11790,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -11861,7 +11804,7 @@ public partial interface IWebAppsOperations
         /// Restores a web app.
         /// </summary>
         /// <remarks>
-        /// Restores a web app.
+        /// Description for Restores a web app.
         /// </remarks>
         /// <param name='subscriptionName'>
         /// Azure subscription.
@@ -11896,8 +11839,8 @@ public partial interface IWebAppsOperations
         /// database.
         /// </summary>
         /// <remarks>
-        /// Migrates a local (in-app) MySql database to a remote MySql
-        /// database.
+        /// Description for Migrates a local (in-app) MySql database to a
+        /// remote MySql database.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11928,7 +11871,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11965,7 +11908,8 @@ public partial interface IWebAppsOperations
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure
+        /// Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11982,7 +11926,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -11993,7 +11937,7 @@ public partial interface IWebAppsOperations
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12010,7 +11954,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12021,7 +11965,7 @@ public partial interface IWebAppsOperations
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12039,7 +11983,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12050,7 +11994,8 @@ public partial interface IWebAppsOperations
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12067,7 +12012,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12078,12 +12023,42 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<SiteExtensionInfo>> BeginInstallSiteExtensionWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
+        /// Copies a deployment slot to another deployment slot of an app.
+        /// </summary>
+        /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot
+        /// of an app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config
+        /// properties to override the source slot config. See example.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse> BeginCopyProductionSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
         /// Creates a new web, mobile, or API app in an existing resource
         /// group, or updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource
-        /// group, or updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an
+        /// existing resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12120,8 +12095,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12145,7 +12120,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12156,7 +12131,7 @@ public partial interface IWebAppsOperations
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12188,7 +12163,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12209,7 +12184,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12223,7 +12198,7 @@ public partial interface IWebAppsOperations
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12235,8 +12210,7 @@ public partial interface IWebAppsOperations
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='functionEnvelope'>
         /// Function details.
@@ -12261,7 +12235,7 @@ public partial interface IWebAppsOperations
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12285,7 +12259,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12299,7 +12273,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12339,7 +12313,8 @@ public partial interface IWebAppsOperations
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure
+        /// Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12360,7 +12335,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12371,7 +12346,7 @@ public partial interface IWebAppsOperations
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12392,7 +12367,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12403,7 +12378,7 @@ public partial interface IWebAppsOperations
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12425,7 +12400,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12436,7 +12411,8 @@ public partial interface IWebAppsOperations
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12449,7 +12425,7 @@ public partial interface IWebAppsOperations
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API
-        /// deletes a deployment for the production slot.
+        /// uses the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -12457,7 +12433,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12468,10 +12444,44 @@ public partial interface IWebAppsOperations
         /// </exception>
         Task<AzureOperationResponse<SiteExtensionInfo>> BeginInstallSiteExtensionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string siteExtensionId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Swaps two deployment slots of an app.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot
+        /// of an app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config
+        /// properties to override the source slot config. See example.
+        /// </param>
+        /// <param name='slot'>
+        /// Name of the source slot. If a slot is not specified, the production
+        /// slot is used as the source slot.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="Microsoft.Rest.ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        Task<AzureOperationResponse> BeginCopySlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
         /// Swaps two deployment slots of an app.
+        /// </summary>
+        /// <remarks>
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12492,7 +12502,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12503,7 +12513,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12539,7 +12549,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12579,7 +12589,7 @@ public partial interface IWebAppsOperations
         /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12596,7 +12606,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.ValidationException">
@@ -12607,7 +12617,7 @@ public partial interface IWebAppsOperations
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12638,7 +12648,7 @@ public partial interface IWebAppsOperations
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12675,7 +12685,7 @@ public partial interface IWebAppsOperations
         /// Get all apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all apps for a subscription.
+        /// Description for Get all apps for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12700,7 +12710,8 @@ public partial interface IWebAppsOperations
         /// Gets all web, mobile, and API apps in the specified resource group.
         /// </summary>
         /// <remarks>
-        /// Gets all web, mobile, and API apps in the specified resource group.
+        /// Description for Gets all web, mobile, and API apps in the specified
+        /// resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12725,7 +12736,7 @@ public partial interface IWebAppsOperations
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12750,7 +12761,7 @@ public partial interface IWebAppsOperations
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12777,9 +12788,9 @@ public partial interface IWebAppsOperations
         /// snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each
-        /// element of the list contains a timestamp and the ID of the
-        /// snapshot.
+        /// Description for Gets a list of web app configuration snapshots
+        /// identifiers. Each element of the list contains a timestamp and the
+        /// ID of the snapshot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12804,7 +12815,8 @@ public partial interface IWebAppsOperations
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12829,7 +12841,7 @@ public partial interface IWebAppsOperations
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12854,7 +12866,8 @@ public partial interface IWebAppsOperations
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated
+        /// with web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12879,7 +12892,8 @@ public partial interface IWebAppsOperations
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12890,7 +12904,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12904,7 +12918,8 @@ public partial interface IWebAppsOperations
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12929,7 +12944,7 @@ public partial interface IWebAppsOperations
         /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12955,8 +12970,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12967,7 +12983,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -12982,8 +12998,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -12994,7 +13010,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13009,35 +13025,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
-        /// </summary>
-        /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Description for List the threads in a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13057,14 +13046,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13084,12 +13071,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13115,8 +13102,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13127,7 +13115,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13142,8 +13130,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13154,7 +13142,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13169,8 +13157,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List the threads in a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13181,7 +13169,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13195,7 +13183,8 @@ public partial interface IWebAppsOperations
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13220,7 +13209,8 @@ public partial interface IWebAppsOperations
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13231,7 +13221,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13245,7 +13235,7 @@ public partial interface IWebAppsOperations
         /// Gets an app's deployment slots.
         /// </summary>
         /// <remarks>
-        /// Gets an app's deployment slots.
+        /// Description for Gets an app's deployment slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13270,7 +13260,7 @@ public partial interface IWebAppsOperations
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13295,7 +13285,7 @@ public partial interface IWebAppsOperations
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13322,9 +13312,9 @@ public partial interface IWebAppsOperations
         /// snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each
-        /// element of the list contains a timestamp and the ID of the
-        /// snapshot.
+        /// Description for Gets a list of web app configuration snapshots
+        /// identifiers. Each element of the list contains a timestamp and the
+        /// ID of the snapshot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13349,7 +13339,8 @@ public partial interface IWebAppsOperations
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13374,7 +13365,7 @@ public partial interface IWebAppsOperations
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13399,7 +13390,8 @@ public partial interface IWebAppsOperations
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated
+        /// with web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13424,7 +13416,8 @@ public partial interface IWebAppsOperations
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13435,7 +13428,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13449,7 +13442,8 @@ public partial interface IWebAppsOperations
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13474,7 +13468,7 @@ public partial interface IWebAppsOperations
         /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13500,8 +13494,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13512,7 +13507,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13527,8 +13522,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13539,7 +13534,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13554,35 +13549,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="Microsoft.Rest.ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
-        /// </summary>
-        /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if
-        /// specified).
+        /// Description for List the threads in a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13602,14 +13570,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13629,12 +13595,12 @@ public partial interface IWebAppsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13660,8 +13626,9 @@ public partial interface IWebAppsOperations
         /// a specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for
-        /// a specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a
+        /// deployment slot, or for a specific scaled-out instance in a web
+        /// site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13672,7 +13639,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13687,8 +13654,8 @@ public partial interface IWebAppsOperations
         /// scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific
-        /// scaled-out instance in a web site.
+        /// Description for List module information for a process by its ID for
+        /// a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13699,7 +13666,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13714,8 +13681,8 @@ public partial interface IWebAppsOperations
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List the threads in a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13726,7 +13693,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13740,7 +13707,8 @@ public partial interface IWebAppsOperations
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13765,7 +13733,8 @@ public partial interface IWebAppsOperations
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13776,7 +13745,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13791,8 +13760,8 @@ public partial interface IWebAppsOperations
         /// slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app
-        /// slots.
+        /// Description for Get the difference in configuration settings
+        /// between two web app slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13817,7 +13786,7 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13842,7 +13811,8 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13867,7 +13837,8 @@ public partial interface IWebAppsOperations
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13893,8 +13864,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment
-        /// slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13905,7 +13876,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -13920,8 +13891,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13946,7 +13917,7 @@ public partial interface IWebAppsOperations
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13972,8 +13943,8 @@ public partial interface IWebAppsOperations
         /// slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app
-        /// slots.
+        /// Description for Get the difference in configuration settings
+        /// between two web app slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -13998,7 +13969,7 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -14023,7 +13994,8 @@ public partial interface IWebAppsOperations
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -14048,7 +14020,8 @@ public partial interface IWebAppsOperations
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -14074,8 +14047,8 @@ public partial interface IWebAppsOperations
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment
-        /// slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -14086,7 +14059,7 @@ public partial interface IWebAppsOperations
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="Microsoft.Rest.Azure.CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="Microsoft.Rest.SerializationException">
@@ -14101,8 +14074,8 @@ public partial interface IWebAppsOperations
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -14127,7 +14100,7 @@ public partial interface IWebAppsOperations
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebSiteManagementClient.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebSiteManagementClient.cs
index 344e24bfa34d..90a90df85620 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebSiteManagementClient.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/IWebSiteManagementClient.cs
@@ -50,6 +50,11 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// </summary>
         string SubscriptionId { get; set; }
 
+        /// <summary>
+        /// API Version
+        /// </summary>
+        string ApiVersion { get; }
+
         /// <summary>
         /// The preferred language for the response.
         /// </summary>
@@ -143,7 +148,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets publishing user
         /// </summary>
         /// <remarks>
-        /// Gets publishing user
+        /// Description for Gets publishing user
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -157,7 +162,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Updates publishing user
         /// </summary>
         /// <remarks>
-        /// Updates publishing user
+        /// Description for Updates publishing user
         /// </remarks>
         /// <param name='userDetails'>
         /// Details of publishing user
@@ -174,7 +179,8 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets the source controls available for Azure websites.
         /// </summary>
         /// <remarks>
-        /// Gets the source controls available for Azure websites.
+        /// Description for Gets the source controls available for Azure
+        /// websites.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -188,7 +194,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets source control token
         /// </summary>
         /// <remarks>
-        /// Gets source control token
+        /// Description for Gets source control token
         /// </remarks>
         /// <param name='sourceControlType'>
         /// Type of source control
@@ -205,7 +211,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Updates source control token
         /// </summary>
         /// <remarks>
-        /// Updates source control token
+        /// Description for Updates source control token
         /// </remarks>
         /// <param name='sourceControlType'>
         /// Type of source control
@@ -225,7 +231,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets a list of meters for a given location.
         /// </summary>
         /// <remarks>
-        /// Gets a list of meters for a given location.
+        /// Description for Gets a list of meters for a given location.
         /// </remarks>
         /// <param name='billingLocation'>
         /// Azure Location of billable resource
@@ -245,7 +251,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Check if a resource name is available.
         /// </summary>
         /// <remarks>
-        /// Check if a resource name is available.
+        /// Description for Check if a resource name is available.
         /// </remarks>
         /// <param name='name'>
         /// Resource name to verify.
@@ -272,7 +278,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets list of available geo regions plus ministamps
         /// </summary>
         /// <remarks>
-        /// Gets list of available geo regions plus ministamps
+        /// Description for Gets list of available geo regions plus ministamps
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -286,7 +292,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Get a list of available geographical regions.
         /// </summary>
         /// <remarks>
-        /// Get a list of available geographical regions.
+        /// Description for Get a list of available geographical regions.
         /// </remarks>
         /// <param name='sku'>
         /// Name of SKU used to filter the regions. Possible values include:
@@ -317,7 +323,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// List all apps that are assigned to a hostname.
         /// </summary>
         /// <remarks>
-        /// List all apps that are assigned to a hostname.
+        /// Description for List all apps that are assigned to a hostname.
         /// </remarks>
         /// <param name='nameIdentifier'>
         /// Hostname information.
@@ -334,7 +340,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// List all premier add-on offers.
         /// </summary>
         /// <remarks>
-        /// List all premier add-on offers.
+        /// Description for List all premier add-on offers.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -348,7 +354,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// List all SKUs.
         /// </summary>
         /// <remarks>
-        /// List all SKUs.
+        /// Description for List all SKUs.
         /// </remarks>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -363,8 +369,8 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// by analyzing the Network Security Group rules.
         /// </summary>
         /// <remarks>
-        /// Verifies if this VNET is compatible with an App Service Environment
-        /// by analyzing the Network Security Group rules.
+        /// Description for Verifies if this VNET is compatible with an App
+        /// Service Environment by analyzing the Network Security Group rules.
         /// </remarks>
         /// <param name='parameters'>
         /// VNET information
@@ -381,7 +387,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Move resources between resource groups.
         /// </summary>
         /// <remarks>
-        /// Move resources between resource groups.
+        /// Description for Move resources between resource groups.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -401,7 +407,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Validate if a resource can be created.
         /// </summary>
         /// <remarks>
-        /// Validate if a resource can be created.
+        /// Description for Validate if a resource can be created.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -417,30 +423,11 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// </param>
         Task<AzureOperationResponse<ValidateResponse>> ValidateWithHttpMessagesAsync(string resourceGroupName, ValidateRequest validateRequest, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
 
-        /// <summary>
-        /// Validate if the container settings are correct.
-        /// </summary>
-        /// <remarks>
-        /// Validate if the container settings are correct.
-        /// </remarks>
-        /// <param name='validateContainerSettingsRequest'>
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        Task<AzureOperationResponse<object>> ValidateContainerSettingsWithHttpMessagesAsync(ValidateContainerSettingsRequest validateContainerSettingsRequest, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-
         /// <summary>
         /// Validate whether a resource can be moved.
         /// </summary>
         /// <remarks>
-        /// Validate whether a resource can be moved.
+        /// Description for Validate whether a resource can be moved.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -460,7 +447,8 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets the source controls available for Azure websites.
         /// </summary>
         /// <remarks>
-        /// Gets the source controls available for Azure websites.
+        /// Description for Gets the source controls available for Azure
+        /// websites.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -477,7 +465,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Gets a list of meters for a given location.
         /// </summary>
         /// <remarks>
-        /// Gets a list of meters for a given location.
+        /// Description for Gets a list of meters for a given location.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -494,7 +482,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// Get a list of available geographical regions.
         /// </summary>
         /// <remarks>
-        /// Get a list of available geographical regions.
+        /// Description for Get a list of available geographical regions.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -511,7 +499,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// List all apps that are assigned to a hostname.
         /// </summary>
         /// <remarks>
-        /// List all apps that are assigned to a hostname.
+        /// Description for List all apps that are assigned to a hostname.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -528,7 +516,7 @@ public partial interface IWebSiteManagementClient : System.IDisposable
         /// List all premier add-on offers.
         /// </summary>
         /// <remarks>
-        /// List all premier add-on offers.
+        /// Description for List all premier add-on offers.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AddressResponse.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AddressResponse.cs
index bd295ef3847d..879dbaad9a28 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AddressResponse.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/AddressResponse.cs
@@ -10,6 +10,8 @@
 
 namespace Microsoft.Azure.Management.WebSites.Models
 {
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
     using Newtonsoft.Json;
     using System.Collections;
     using System.Collections.Generic;
@@ -18,7 +20,8 @@ namespace Microsoft.Azure.Management.WebSites.Models
     /// <summary>
     /// Describes main public IP address and any extra virtual IPs.
     /// </summary>
-    public partial class AddressResponse
+    [Rest.Serialization.JsonTransformation]
+    public partial class AddressResponse : ProxyOnlyResource
     {
         /// <summary>
         /// Initializes a new instance of the AddressResponse class.
@@ -31,6 +34,10 @@ public AddressResponse()
         /// <summary>
         /// Initializes a new instance of the AddressResponse class.
         /// </summary>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource Name.</param>
+        /// <param name="kind">Kind of resource.</param>
+        /// <param name="type">Resource type.</param>
         /// <param name="serviceIpAddress">Main public virtual IP.</param>
         /// <param name="internalIpAddress">Virtual Network internal IP address
         /// of the App Service Environment if it is in internal load-balancing
@@ -38,7 +45,8 @@ public AddressResponse()
         /// <param name="outboundIpAddresses">IP addresses appearing on
         /// outbound connections.</param>
         /// <param name="vipMappings">Additional virtual IPs.</param>
-        public AddressResponse(string serviceIpAddress = default(string), string internalIpAddress = default(string), IList<string> outboundIpAddresses = default(IList<string>), IList<VirtualIPMapping> vipMappings = default(IList<VirtualIPMapping>))
+        public AddressResponse(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string serviceIpAddress = default(string), string internalIpAddress = default(string), IList<string> outboundIpAddresses = default(IList<string>), IList<VirtualIPMapping> vipMappings = default(IList<VirtualIPMapping>))
+            : base(id, name, kind, type)
         {
             ServiceIpAddress = serviceIpAddress;
             InternalIpAddress = internalIpAddress;
@@ -55,26 +63,26 @@ public AddressResponse()
         /// <summary>
         /// Gets or sets main public virtual IP.
         /// </summary>
-        [JsonProperty(PropertyName = "serviceIpAddress")]
+        [JsonProperty(PropertyName = "properties.serviceIpAddress")]
         public string ServiceIpAddress { get; set; }
 
         /// <summary>
         /// Gets or sets virtual Network internal IP address of the App Service
         /// Environment if it is in internal load-balancing mode.
         /// </summary>
-        [JsonProperty(PropertyName = "internalIpAddress")]
+        [JsonProperty(PropertyName = "properties.internalIpAddress")]
         public string InternalIpAddress { get; set; }
 
         /// <summary>
         /// Gets or sets IP addresses appearing on outbound connections.
         /// </summary>
-        [JsonProperty(PropertyName = "outboundIpAddresses")]
+        [JsonProperty(PropertyName = "properties.outboundIpAddresses")]
         public IList<string> OutboundIpAddresses { get; set; }
 
         /// <summary>
         /// Gets or sets additional virtual IPs.
         /// </summary>
-        [JsonProperty(PropertyName = "vipMappings")]
+        [JsonProperty(PropertyName = "properties.vipMappings")]
         public IList<VirtualIPMapping> VipMappings { get; set; }
 
     }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs
new file mode 100644
index 000000000000..03ac32368367
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiKVReference.cs
@@ -0,0 +1,114 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Description of site key vault references.
+    /// </summary>
+    public partial class ApiKVReference
+    {
+        /// <summary>
+        /// Initializes a new instance of the ApiKVReference class.
+        /// </summary>
+        public ApiKVReference()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ApiKVReference class.
+        /// </summary>
+        /// <param name="status">Possible values include: 'Initialized',
+        /// 'Resolved', 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound',
+        /// 'SecretNotFound', 'SecretVersionNotFound',
+        /// 'AccessToKeyVaultDenied', 'OtherReasons'</param>
+        /// <param name="identityType">Possible values include: 'None',
+        /// 'SystemAssigned', 'UserAssigned'</param>
+        /// <param name="source">Possible values include: 'KeyVault'</param>
+        /// <param name="location">Possible values include:
+        /// 'ApplicationSetting'</param>
+        public ApiKVReference(string reference = default(string), ResolveStatus? status = default(ResolveStatus?), string vaultName = default(string), string secretName = default(string), string secretVersion = default(string), ManagedServiceIdentityType? identityType = default(ManagedServiceIdentityType?), string details = default(string), ConfigReferenceSource? source = default(ConfigReferenceSource?), ConfigReferenceLocation? location = default(ConfigReferenceLocation?))
+        {
+            Reference = reference;
+            Status = status;
+            VaultName = vaultName;
+            SecretName = secretName;
+            SecretVersion = secretVersion;
+            IdentityType = identityType;
+            Details = details;
+            Source = source;
+            Location = location;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "reference")]
+        public string Reference { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'Initialized', 'Resolved',
+        /// 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound',
+        /// 'SecretNotFound', 'SecretVersionNotFound',
+        /// 'AccessToKeyVaultDenied', 'OtherReasons'
+        /// </summary>
+        [JsonProperty(PropertyName = "status")]
+        public ResolveStatus? Status { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "vaultName")]
+        public string VaultName { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "secretName")]
+        public string SecretName { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "secretVersion")]
+        public string SecretVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'None', 'SystemAssigned',
+        /// 'UserAssigned'
+        /// </summary>
+        [JsonProperty(PropertyName = "identityType")]
+        public ManagedServiceIdentityType? IdentityType { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "details")]
+        public string Details { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'KeyVault'
+        /// </summary>
+        [JsonProperty(PropertyName = "source")]
+        public ConfigReferenceSource? Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'ApplicationSetting'
+        /// </summary>
+        [JsonProperty(PropertyName = "location")]
+        public ConfigReferenceLocation? Location { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiManagementConfig.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiManagementConfig.cs
new file mode 100644
index 000000000000..2b6bf8637dc2
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApiManagementConfig.cs
@@ -0,0 +1,51 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Azure API management (APIM) configuration linked to the app.
+    /// </summary>
+    public partial class ApiManagementConfig
+    {
+        /// <summary>
+        /// Initializes a new instance of the ApiManagementConfig class.
+        /// </summary>
+        public ApiManagementConfig()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ApiManagementConfig class.
+        /// </summary>
+        /// <param name="id">APIM-Api Identifier.</param>
+        public ApiManagementConfig(string id = default(string))
+        {
+            Id = id;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets aPIM-Api Identifier.
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApplicationStackResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApplicationStackResource.cs
new file mode 100644
index 000000000000..ac8153b7ec12
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ApplicationStackResource.cs
@@ -0,0 +1,96 @@
+// <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.WebSites.Models
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// ARM resource for a ApplicationStack.
+    /// </summary>
+    [Rest.Serialization.JsonTransformation]
+    public partial class ApplicationStackResource : ProxyOnlyResource
+    {
+        /// <summary>
+        /// Initializes a new instance of the ApplicationStackResource class.
+        /// </summary>
+        public ApplicationStackResource()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ApplicationStackResource class.
+        /// </summary>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource Name.</param>
+        /// <param name="kind">Kind of resource.</param>
+        /// <param name="type">Resource type.</param>
+        /// <param name="applicationStackResourceName">Application stack
+        /// name.</param>
+        /// <param name="display">Application stack display name.</param>
+        /// <param name="dependency">Application stack dependency.</param>
+        /// <param name="majorVersions">List of major versions
+        /// available.</param>
+        /// <param name="frameworks">List of frameworks associated with
+        /// application stack.</param>
+        public ApplicationStackResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string applicationStackResourceName = default(string), string display = default(string), string dependency = default(string), IList<StackMajorVersion> majorVersions = default(IList<StackMajorVersion>), IList<ApplicationStack> frameworks = default(IList<ApplicationStack>))
+            : base(id, name, kind, type)
+        {
+            ApplicationStackResourceName = applicationStackResourceName;
+            Display = display;
+            Dependency = dependency;
+            MajorVersions = majorVersions;
+            Frameworks = frameworks;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets application stack name.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.name")]
+        public string ApplicationStackResourceName { get; set; }
+
+        /// <summary>
+        /// Gets or sets application stack display name.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.display")]
+        public string Display { get; set; }
+
+        /// <summary>
+        /// Gets or sets application stack dependency.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.dependency")]
+        public string Dependency { get; set; }
+
+        /// <summary>
+        /// Gets or sets list of major versions available.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.majorVersions")]
+        public IList<StackMajorVersion> MajorVersions { get; set; }
+
+        /// <summary>
+        /// Gets or sets list of frameworks associated with application stack.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.frameworks")]
+        public IList<ApplicationStack> Frameworks { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Certificate.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Certificate.cs
index ec1ac505ae3d..d46eb9c0661c 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Certificate.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Certificate.cs
@@ -70,7 +70,9 @@ public Certificate()
         /// <param name="serverFarmId">Resource ID of the associated App
         /// Service plan, formatted as:
         /// "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}".</param>
-        public Certificate(string location, string password, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string friendlyName = default(string), string subjectName = default(string), IList<string> hostNames = default(IList<string>), byte[] pfxBlob = default(byte[]), string siteName = default(string), string selfLink = default(string), string issuer = default(string), System.DateTime? issueDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), string thumbprint = default(string), bool? valid = default(bool?), byte[] cerBlob = default(byte[]), string publicKeyHash = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), string keyVaultId = default(string), string keyVaultSecretName = default(string), KeyVaultSecretStatus? keyVaultSecretStatus = default(KeyVaultSecretStatus?), string serverFarmId = default(string))
+        /// <param name="canonicalName">CNAME of the certificate to be issued
+        /// via free certificate</param>
+        public Certificate(string location, string password, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string friendlyName = default(string), string subjectName = default(string), IList<string> hostNames = default(IList<string>), byte[] pfxBlob = default(byte[]), string siteName = default(string), string selfLink = default(string), string issuer = default(string), System.DateTime? issueDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), string thumbprint = default(string), bool? valid = default(bool?), byte[] cerBlob = default(byte[]), string publicKeyHash = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), string keyVaultId = default(string), string keyVaultSecretName = default(string), KeyVaultSecretStatus? keyVaultSecretStatus = default(KeyVaultSecretStatus?), string serverFarmId = default(string), string canonicalName = default(string))
             : base(location, id, name, kind, type, tags)
         {
             FriendlyName = friendlyName;
@@ -92,6 +94,7 @@ public Certificate()
             KeyVaultSecretName = keyVaultSecretName;
             KeyVaultSecretStatus = keyVaultSecretStatus;
             ServerFarmId = serverFarmId;
+            CanonicalName = canonicalName;
             CustomInit();
         }
 
@@ -222,6 +225,13 @@ public Certificate()
         [JsonProperty(PropertyName = "properties.serverFarmId")]
         public string ServerFarmId { get; set; }
 
+        /// <summary>
+        /// Gets or sets CNAME of the certificate to be issued via free
+        /// certificate
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.canonicalName")]
+        public string CanonicalName { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CertificatePatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CertificatePatchResource.cs
index ac6b20461ea7..f2579bd985bc 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CertificatePatchResource.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CertificatePatchResource.cs
@@ -68,7 +68,9 @@ public CertificatePatchResource()
         /// <param name="serverFarmId">Resource ID of the associated App
         /// Service plan, formatted as:
         /// "/subscriptions/{subscriptionID}/resourceGroups/{groupName}/providers/Microsoft.Web/serverfarms/{appServicePlanName}".</param>
-        public CertificatePatchResource(string password, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string friendlyName = default(string), string subjectName = default(string), IList<string> hostNames = default(IList<string>), byte[] pfxBlob = default(byte[]), string siteName = default(string), string selfLink = default(string), string issuer = default(string), System.DateTime? issueDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), string thumbprint = default(string), bool? valid = default(bool?), byte[] cerBlob = default(byte[]), string publicKeyHash = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), string keyVaultId = default(string), string keyVaultSecretName = default(string), KeyVaultSecretStatus? keyVaultSecretStatus = default(KeyVaultSecretStatus?), string serverFarmId = default(string))
+        /// <param name="canonicalName">CNAME of the certificate to be issued
+        /// via free certificate</param>
+        public CertificatePatchResource(string password, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string friendlyName = default(string), string subjectName = default(string), IList<string> hostNames = default(IList<string>), byte[] pfxBlob = default(byte[]), string siteName = default(string), string selfLink = default(string), string issuer = default(string), System.DateTime? issueDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), string thumbprint = default(string), bool? valid = default(bool?), byte[] cerBlob = default(byte[]), string publicKeyHash = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), string keyVaultId = default(string), string keyVaultSecretName = default(string), KeyVaultSecretStatus? keyVaultSecretStatus = default(KeyVaultSecretStatus?), string serverFarmId = default(string), string canonicalName = default(string))
             : base(id, name, kind, type)
         {
             FriendlyName = friendlyName;
@@ -90,6 +92,7 @@ public CertificatePatchResource()
             KeyVaultSecretName = keyVaultSecretName;
             KeyVaultSecretStatus = keyVaultSecretStatus;
             ServerFarmId = serverFarmId;
+            CanonicalName = canonicalName;
             CustomInit();
         }
 
@@ -220,6 +223,13 @@ public CertificatePatchResource()
         [JsonProperty(PropertyName = "properties.serverFarmId")]
         public string ServerFarmId { get; set; }
 
+        /// <summary>
+        /// Gets or sets CNAME of the certificate to be issued via free
+        /// certificate
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.canonicalName")]
+        public string CanonicalName { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs
new file mode 100644
index 000000000000..74a43ab877e6
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceLocation.cs
@@ -0,0 +1,54 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System.Runtime;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Defines values for ConfigReferenceLocation.
+    /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum ConfigReferenceLocation
+    {
+        [EnumMember(Value = "ApplicationSetting")]
+        ApplicationSetting
+    }
+    internal static class ConfigReferenceLocationEnumExtension
+    {
+        internal static string ToSerializedValue(this ConfigReferenceLocation? value)
+        {
+            return value == null ? null : ((ConfigReferenceLocation)value).ToSerializedValue();
+        }
+
+        internal static string ToSerializedValue(this ConfigReferenceLocation value)
+        {
+            switch( value )
+            {
+                case ConfigReferenceLocation.ApplicationSetting:
+                    return "ApplicationSetting";
+            }
+            return null;
+        }
+
+        internal static ConfigReferenceLocation? ParseConfigReferenceLocation(this string value)
+        {
+            switch( value )
+            {
+                case "ApplicationSetting":
+                    return ConfigReferenceLocation.ApplicationSetting;
+            }
+            return null;
+        }
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs
new file mode 100644
index 000000000000..621c4362c717
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ConfigReferenceSource.cs
@@ -0,0 +1,54 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System.Runtime;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Defines values for ConfigReferenceSource.
+    /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum ConfigReferenceSource
+    {
+        [EnumMember(Value = "KeyVault")]
+        KeyVault
+    }
+    internal static class ConfigReferenceSourceEnumExtension
+    {
+        internal static string ToSerializedValue(this ConfigReferenceSource? value)
+        {
+            return value == null ? null : ((ConfigReferenceSource)value).ToSerializedValue();
+        }
+
+        internal static string ToSerializedValue(this ConfigReferenceSource value)
+        {
+            switch( value )
+            {
+                case ConfigReferenceSource.KeyVault:
+                    return "KeyVault";
+            }
+            return null;
+        }
+
+        internal static ConfigReferenceSource? ParseConfigReferenceSource(this string value)
+        {
+            switch( value )
+            {
+                case "KeyVault":
+                    return ConfigReferenceSource.KeyVault;
+            }
+            return null;
+        }
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuStatistics.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuStatistics.cs
new file mode 100644
index 000000000000..fef297e782d1
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuStatistics.cs
@@ -0,0 +1,64 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    public partial class ContainerCpuStatistics
+    {
+        /// <summary>
+        /// Initializes a new instance of the ContainerCpuStatistics class.
+        /// </summary>
+        public ContainerCpuStatistics()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ContainerCpuStatistics class.
+        /// </summary>
+        public ContainerCpuStatistics(ContainerCpuUsage cpuUsage = default(ContainerCpuUsage), long? systemCpuUsage = default(long?), int? onlineCpuCount = default(int?), ContainerThrottlingData throttlingData = default(ContainerThrottlingData))
+        {
+            CpuUsage = cpuUsage;
+            SystemCpuUsage = systemCpuUsage;
+            OnlineCpuCount = onlineCpuCount;
+            ThrottlingData = throttlingData;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "cpuUsage")]
+        public ContainerCpuUsage CpuUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "systemCpuUsage")]
+        public long? SystemCpuUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "onlineCpuCount")]
+        public int? OnlineCpuCount { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "throttlingData")]
+        public ContainerThrottlingData ThrottlingData { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuUsage.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuUsage.cs
new file mode 100644
index 000000000000..b0d93c37d24d
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerCpuUsage.cs
@@ -0,0 +1,66 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    public partial class ContainerCpuUsage
+    {
+        /// <summary>
+        /// Initializes a new instance of the ContainerCpuUsage class.
+        /// </summary>
+        public ContainerCpuUsage()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ContainerCpuUsage class.
+        /// </summary>
+        public ContainerCpuUsage(long? totalUsage = default(long?), IList<long?> perCpuUsage = default(IList<long?>), long? kernelModeUsage = default(long?), long? userModeUsage = default(long?))
+        {
+            TotalUsage = totalUsage;
+            PerCpuUsage = perCpuUsage;
+            KernelModeUsage = kernelModeUsage;
+            UserModeUsage = userModeUsage;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "totalUsage")]
+        public long? TotalUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "perCpuUsage")]
+        public IList<long?> PerCpuUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "kernelModeUsage")]
+        public long? KernelModeUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "userModeUsage")]
+        public long? UserModeUsage { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerInfo.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerInfo.cs
new file mode 100644
index 000000000000..0eecbf3b3654
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerInfo.cs
@@ -0,0 +1,88 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    public partial class ContainerInfo
+    {
+        /// <summary>
+        /// Initializes a new instance of the ContainerInfo class.
+        /// </summary>
+        public ContainerInfo()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ContainerInfo class.
+        /// </summary>
+        public ContainerInfo(System.DateTime? currentTimeStamp = default(System.DateTime?), System.DateTime? previousTimeStamp = default(System.DateTime?), ContainerCpuStatistics currentCpuStats = default(ContainerCpuStatistics), ContainerCpuStatistics previousCpuStats = default(ContainerCpuStatistics), ContainerMemoryStatistics memoryStats = default(ContainerMemoryStatistics), string name = default(string), string id = default(string), ContainerNetworkInterfaceStatistics eth0 = default(ContainerNetworkInterfaceStatistics))
+        {
+            CurrentTimeStamp = currentTimeStamp;
+            PreviousTimeStamp = previousTimeStamp;
+            CurrentCpuStats = currentCpuStats;
+            PreviousCpuStats = previousCpuStats;
+            MemoryStats = memoryStats;
+            Name = name;
+            Id = id;
+            Eth0 = eth0;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "currentTimeStamp")]
+        public System.DateTime? CurrentTimeStamp { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "previousTimeStamp")]
+        public System.DateTime? PreviousTimeStamp { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "currentCpuStats")]
+        public ContainerCpuStatistics CurrentCpuStats { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "previousCpuStats")]
+        public ContainerCpuStatistics PreviousCpuStats { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "memoryStats")]
+        public ContainerMemoryStatistics MemoryStats { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "id")]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "eth0")]
+        public ContainerNetworkInterfaceStatistics Eth0 { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricProperty.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerMemoryStatistics.cs
similarity index 51%
rename from sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricProperty.cs
rename to sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerMemoryStatistics.cs
index 98a4aa89ab93..ac4bc9cbfc83 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricProperty.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerMemoryStatistics.cs
@@ -13,28 +13,24 @@ namespace Microsoft.Azure.Management.WebSites.Models
     using Newtonsoft.Json;
     using System.Linq;
 
-    /// <summary>
-    /// Resource metric property.
-    /// </summary>
-    public partial class ResourceMetricProperty
+    public partial class ContainerMemoryStatistics
     {
         /// <summary>
-        /// Initializes a new instance of the ResourceMetricProperty class.
+        /// Initializes a new instance of the ContainerMemoryStatistics class.
         /// </summary>
-        public ResourceMetricProperty()
+        public ContainerMemoryStatistics()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the ResourceMetricProperty class.
+        /// Initializes a new instance of the ContainerMemoryStatistics class.
         /// </summary>
-        /// <param name="key">Key for resource metric property.</param>
-        /// <param name="value">Value of pair.</param>
-        public ResourceMetricProperty(string key = default(string), string value = default(string))
+        public ContainerMemoryStatistics(long? usage = default(long?), long? maxUsage = default(long?), long? limit = default(long?))
         {
-            Key = key;
-            Value = value;
+            Usage = usage;
+            MaxUsage = maxUsage;
+            Limit = limit;
             CustomInit();
         }
 
@@ -44,16 +40,19 @@ public ResourceMetricProperty()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets key for resource metric property.
         /// </summary>
-        [JsonProperty(PropertyName = "key")]
-        public string Key { get; set; }
+        [JsonProperty(PropertyName = "usage")]
+        public long? Usage { get; set; }
 
         /// <summary>
-        /// Gets or sets value of pair.
         /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public string Value { get; set; }
+        [JsonProperty(PropertyName = "maxUsage")]
+        public long? MaxUsage { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "limit")]
+        public long? Limit { get; set; }
 
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerNetworkInterfaceStatistics.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerNetworkInterfaceStatistics.cs
new file mode 100644
index 000000000000..f2a7bdfdb180
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerNetworkInterfaceStatistics.cs
@@ -0,0 +1,90 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    public partial class ContainerNetworkInterfaceStatistics
+    {
+        /// <summary>
+        /// Initializes a new instance of the
+        /// ContainerNetworkInterfaceStatistics class.
+        /// </summary>
+        public ContainerNetworkInterfaceStatistics()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// ContainerNetworkInterfaceStatistics class.
+        /// </summary>
+        public ContainerNetworkInterfaceStatistics(long? rxBytes = default(long?), long? rxPackets = default(long?), long? rxErrors = default(long?), long? rxDropped = default(long?), long? txBytes = default(long?), long? txPackets = default(long?), long? txErrors = default(long?), long? txDropped = default(long?))
+        {
+            RxBytes = rxBytes;
+            RxPackets = rxPackets;
+            RxErrors = rxErrors;
+            RxDropped = rxDropped;
+            TxBytes = txBytes;
+            TxPackets = txPackets;
+            TxErrors = txErrors;
+            TxDropped = txDropped;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "rxBytes")]
+        public long? RxBytes { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "rxPackets")]
+        public long? RxPackets { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "rxErrors")]
+        public long? RxErrors { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "rxDropped")]
+        public long? RxDropped { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "txBytes")]
+        public long? TxBytes { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "txPackets")]
+        public long? TxPackets { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "txErrors")]
+        public long? TxErrors { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "txDropped")]
+        public long? TxDropped { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoDistribution.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerThrottlingData.cs
similarity index 51%
rename from sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoDistribution.cs
rename to sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerThrottlingData.cs
index 87ff67678ae2..286d2ae0c717 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoDistribution.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ContainerThrottlingData.cs
@@ -13,28 +13,24 @@ namespace Microsoft.Azure.Management.WebSites.Models
     using Newtonsoft.Json;
     using System.Linq;
 
-    /// <summary>
-    /// A global distribution definition.
-    /// </summary>
-    public partial class GeoDistribution
+    public partial class ContainerThrottlingData
     {
         /// <summary>
-        /// Initializes a new instance of the GeoDistribution class.
+        /// Initializes a new instance of the ContainerThrottlingData class.
         /// </summary>
-        public GeoDistribution()
+        public ContainerThrottlingData()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the GeoDistribution class.
+        /// Initializes a new instance of the ContainerThrottlingData class.
         /// </summary>
-        /// <param name="location">Location.</param>
-        /// <param name="numberOfWorkers">NumberOfWorkers.</param>
-        public GeoDistribution(string location = default(string), int? numberOfWorkers = default(int?))
+        public ContainerThrottlingData(int? periods = default(int?), int? throttledPeriods = default(int?), int? throttledTime = default(int?))
         {
-            Location = location;
-            NumberOfWorkers = numberOfWorkers;
+            Periods = periods;
+            ThrottledPeriods = throttledPeriods;
+            ThrottledTime = throttledTime;
             CustomInit();
         }
 
@@ -44,16 +40,19 @@ public GeoDistribution()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets location.
         /// </summary>
-        [JsonProperty(PropertyName = "location")]
-        public string Location { get; set; }
+        [JsonProperty(PropertyName = "periods")]
+        public int? Periods { get; set; }
 
         /// <summary>
-        /// Gets or sets numberOfWorkers.
         /// </summary>
-        [JsonProperty(PropertyName = "numberOfWorkers")]
-        public int? NumberOfWorkers { get; set; }
+        [JsonProperty(PropertyName = "throttledPeriods")]
+        public int? ThrottledPeriods { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "throttledTime")]
+        public int? ThrottledTime { get; set; }
 
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CsmCopySlotEntity.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CsmCopySlotEntity.cs
new file mode 100644
index 000000000000..0c117e09339b
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/CsmCopySlotEntity.cs
@@ -0,0 +1,93 @@
+// <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.WebSites.Models
+{
+    using Microsoft.Rest;
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Copy deployment slot parameters.
+    /// </summary>
+    public partial class CsmCopySlotEntity
+    {
+        /// <summary>
+        /// Initializes a new instance of the CsmCopySlotEntity class.
+        /// </summary>
+        public CsmCopySlotEntity()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CsmCopySlotEntity class.
+        /// </summary>
+        /// <param name="targetSlot">Destination deployment slot during copy
+        /// operation.</param>
+        /// <param name="siteConfig">The site object which will be merged with
+        /// the source slot site
+        /// to produce new destination slot site object.
+        /// &lt;code&gt;null&lt;/code&gt; to just copy source slot content.
+        /// Otherwise a &lt;code&gt;Site&lt;/code&gt;
+        /// object with properties to override source slot site.</param>
+        public CsmCopySlotEntity(string targetSlot, SiteConfig siteConfig)
+        {
+            TargetSlot = targetSlot;
+            SiteConfig = siteConfig;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets destination deployment slot during copy operation.
+        /// </summary>
+        [JsonProperty(PropertyName = "targetSlot")]
+        public string TargetSlot { get; set; }
+
+        /// <summary>
+        /// Gets or sets the site object which will be merged with the source
+        /// slot site
+        /// to produce new destination slot site object.
+        /// &amp;lt;code&amp;gt;null&amp;lt;/code&amp;gt; to just copy source
+        /// slot content. Otherwise a
+        /// &amp;lt;code&amp;gt;Site&amp;lt;/code&amp;gt;
+        /// object with properties to override source slot site.
+        /// </summary>
+        [JsonProperty(PropertyName = "siteConfig")]
+        public SiteConfig SiteConfig { get; set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (TargetSlot == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "TargetSlot");
+            }
+            if (SiteConfig == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "SiteConfig");
+            }
+            if (SiteConfig != null)
+            {
+                SiteConfig.Validate();
+            }
+        }
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailablilityCheckResult.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailabilityCheckResult.cs
similarity index 86%
rename from sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailablilityCheckResult.cs
rename to sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailabilityCheckResult.cs
index 364ff8bec4da..42eec84d942e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailablilityCheckResult.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/DomainAvailabilityCheckResult.cs
@@ -16,19 +16,19 @@ namespace Microsoft.Azure.Management.WebSites.Models
     /// <summary>
     /// Domain availability check result.
     /// </summary>
-    public partial class DomainAvailablilityCheckResult
+    public partial class DomainAvailabilityCheckResult
     {
         /// <summary>
-        /// Initializes a new instance of the DomainAvailablilityCheckResult
+        /// Initializes a new instance of the DomainAvailabilityCheckResult
         /// class.
         /// </summary>
-        public DomainAvailablilityCheckResult()
+        public DomainAvailabilityCheckResult()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the DomainAvailablilityCheckResult
+        /// Initializes a new instance of the DomainAvailabilityCheckResult
         /// class.
         /// </summary>
         /// <param name="name">Name of the domain.</param>
@@ -40,7 +40,7 @@ public DomainAvailablilityCheckResult()
         /// Purchasing this domain will simply restore it and this operation
         /// will not cost anything. Possible values include: 'Regular',
         /// 'SoftDeleted'</param>
-        public DomainAvailablilityCheckResult(string name = default(string), bool? available = default(bool?), DomainType? domainType = default(DomainType?))
+        public DomainAvailabilityCheckResult(string name = default(string), bool? available = default(bool?), DomainType? domainType = default(DomainType?))
         {
             Name = name;
             Available = available;
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EndpointDetail.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EndpointDetail.cs
index 61bf5f745834..427ffe880862 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EndpointDetail.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/EndpointDetail.cs
@@ -36,15 +36,15 @@ public EndpointDetail()
         /// <param name="latency">The time in milliseconds it takes for a TCP
         /// connection to be created from the App Service Environment to this
         /// IpAddress at this Port.</param>
-        /// <param name="isAccessable">Whether it is possible to create a TCP
+        /// <param name="isAccessible">Whether it is possible to create a TCP
         /// connection from the App Service Environment to this IpAddress at
         /// this Port.</param>
-        public EndpointDetail(string ipAddress = default(string), int? port = default(int?), double? latency = default(double?), bool? isAccessable = default(bool?))
+        public EndpointDetail(string ipAddress = default(string), int? port = default(int?), double? latency = default(double?), bool? isAccessible = default(bool?))
         {
             IpAddress = ipAddress;
             Port = port;
             Latency = latency;
-            IsAccessable = isAccessable;
+            IsAccessible = isAccessible;
             CustomInit();
         }
 
@@ -77,8 +77,8 @@ public EndpointDetail()
         /// Gets or sets whether it is possible to create a TCP connection from
         /// the App Service Environment to this IpAddress at this Port.
         /// </summary>
-        [JsonProperty(PropertyName = "isAccessable")]
-        public bool? IsAccessable { get; set; }
+        [JsonProperty(PropertyName = "isAccessible")]
+        public bool? IsAccessible { get; set; }
 
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionEnvelope.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionEnvelope.cs
index bf30a265251c..0e0627a92be9 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionEnvelope.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/FunctionEnvelope.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.WebSites.Models
     using System.Linq;
 
     /// <summary>
-    /// Web Job Information.
+    /// Function information.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class FunctionEnvelope : ProxyOnlyResource
@@ -42,24 +42,33 @@ public FunctionEnvelope()
         /// <param name="scriptRootPathHref">Script root path URI.</param>
         /// <param name="scriptHref">Script URI.</param>
         /// <param name="configHref">Config URI.</param>
+        /// <param name="testDataHref">Test data URI.</param>
         /// <param name="secretsFileHref">Secrets file URI.</param>
         /// <param name="href">Function URI.</param>
         /// <param name="config">Config information.</param>
         /// <param name="files">File list.</param>
         /// <param name="testData">Test data used when testing via the Azure
         /// Portal.</param>
-        public FunctionEnvelope(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string functionAppId = default(string), string scriptRootPathHref = default(string), string scriptHref = default(string), string configHref = default(string), string secretsFileHref = default(string), string href = default(string), object config = default(object), IDictionary<string, string> files = default(IDictionary<string, string>), string testData = default(string))
+        /// <param name="invokeUrlTemplate">The invocation URL</param>
+        /// <param name="language">The function language</param>
+        /// <param name="isDisabled">Gets or sets a value indicating whether
+        /// the function is disabled</param>
+        public FunctionEnvelope(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string functionAppId = default(string), string scriptRootPathHref = default(string), string scriptHref = default(string), string configHref = default(string), string testDataHref = default(string), string secretsFileHref = default(string), string href = default(string), object config = default(object), IDictionary<string, string> files = default(IDictionary<string, string>), string testData = default(string), string invokeUrlTemplate = default(string), string language = default(string), bool? isDisabled = default(bool?))
             : base(id, name, kind, type)
         {
             FunctionAppId = functionAppId;
             ScriptRootPathHref = scriptRootPathHref;
             ScriptHref = scriptHref;
             ConfigHref = configHref;
+            TestDataHref = testDataHref;
             SecretsFileHref = secretsFileHref;
             Href = href;
             Config = config;
             Files = files;
             TestData = testData;
+            InvokeUrlTemplate = invokeUrlTemplate;
+            Language = language;
+            IsDisabled = isDisabled;
             CustomInit();
         }
 
@@ -92,6 +101,12 @@ public FunctionEnvelope()
         [JsonProperty(PropertyName = "properties.config_href")]
         public string ConfigHref { get; set; }
 
+        /// <summary>
+        /// Gets or sets test data URI.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.test_data_href")]
+        public string TestDataHref { get; set; }
+
         /// <summary>
         /// Gets or sets secrets file URI.
         /// </summary>
@@ -122,5 +137,23 @@ public FunctionEnvelope()
         [JsonProperty(PropertyName = "properties.test_data")]
         public string TestData { get; set; }
 
+        /// <summary>
+        /// Gets or sets the invocation URL
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.invoke_url_template")]
+        public string InvokeUrlTemplate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the function language
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.language")]
+        public string Language { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the function is disabled
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.isDisabled")]
+        public bool? IsDisabled { get; set; }
+
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoRegion.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoRegion.cs
index d5e0e1bd7884..e39413ff64dd 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoRegion.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/GeoRegion.cs
@@ -38,11 +38,13 @@ public GeoRegion()
         /// <param name="type">Resource type.</param>
         /// <param name="description">Region description.</param>
         /// <param name="displayName">Display name for region.</param>
-        public GeoRegion(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string description = default(string), string displayName = default(string))
+        /// <param name="orgDomain">Display name for region.</param>
+        public GeoRegion(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string description = default(string), string displayName = default(string), string orgDomain = default(string))
             : base(id, name, kind, type)
         {
             Description = description;
             DisplayName = displayName;
+            OrgDomain = orgDomain;
             CustomInit();
         }
 
@@ -63,5 +65,11 @@ public GeoRegion()
         [JsonProperty(PropertyName = "properties.displayName")]
         public string DisplayName { get; private set; }
 
+        /// <summary>
+        /// Gets display name for region.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.orgDomain")]
+        public string OrgDomain { get; private set; }
+
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HostingEnvironmentDiagnostics.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HostingEnvironmentDiagnostics.cs
index 136bc406a8b7..bf1546b5752d 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HostingEnvironmentDiagnostics.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/HostingEnvironmentDiagnostics.cs
@@ -32,11 +32,11 @@ public HostingEnvironmentDiagnostics()
         /// class.
         /// </summary>
         /// <param name="name">Name/identifier of the diagnostics.</param>
-        /// <param name="diagnosicsOutput">Diagnostics output.</param>
-        public HostingEnvironmentDiagnostics(string name = default(string), string diagnosicsOutput = default(string))
+        /// <param name="diagnosticsOutput">Diagnostics output.</param>
+        public HostingEnvironmentDiagnostics(string name = default(string), string diagnosticsOutput = default(string))
         {
             Name = name;
-            DiagnosicsOutput = diagnosicsOutput;
+            DiagnosticsOutput = diagnosticsOutput;
             CustomInit();
         }
 
@@ -54,8 +54,8 @@ public HostingEnvironmentDiagnostics()
         /// <summary>
         /// Gets or sets diagnostics output.
         /// </summary>
-        [JsonProperty(PropertyName = "diagnosicsOutput")]
-        public string DiagnosicsOutput { get; set; }
+        [JsonProperty(PropertyName = "diagnosticsOutput")]
+        public string DiagnosticsOutput { get; set; }
 
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Identifier.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Identifier.cs
index a6d5dea22b0f..7571f8806156 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Identifier.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Identifier.cs
@@ -36,12 +36,11 @@ public Identifier()
         /// <param name="name">Resource Name.</param>
         /// <param name="kind">Kind of resource.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="identifierId">String representation of the
-        /// identity.</param>
-        public Identifier(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string identifierId = default(string))
+        /// <param name="value">String representation of the identity.</param>
+        public Identifier(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string value = default(string))
             : base(id, name, kind, type)
         {
-            IdentifierId = identifierId;
+            Value = value;
             CustomInit();
         }
 
@@ -54,7 +53,7 @@ public Identifier()
         /// Gets or sets string representation of the identity.
         /// </summary>
         [JsonProperty(PropertyName = "properties.id")]
-        public string IdentifierId { get; set; }
+        public string Value { get; set; }
 
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs
new file mode 100644
index 000000000000..a0f976b34240
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceCollection.cs
@@ -0,0 +1,61 @@
+// <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.WebSites.Models
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// Web app key vault reference and status ARM resource.
+    /// </summary>
+    [Rest.Serialization.JsonTransformation]
+    public partial class KeyVaultReferenceCollection : ProxyOnlyResource
+    {
+        /// <summary>
+        /// Initializes a new instance of the KeyVaultReferenceCollection
+        /// class.
+        /// </summary>
+        public KeyVaultReferenceCollection()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the KeyVaultReferenceCollection
+        /// class.
+        /// </summary>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource Name.</param>
+        /// <param name="kind">Kind of resource.</param>
+        /// <param name="type">Resource type.</param>
+        public KeyVaultReferenceCollection(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary<string, ApiKVReference> keyToReferenceStatuses = default(IDictionary<string, ApiKVReference>))
+            : base(id, name, kind, type)
+        {
+            KeyToReferenceStatuses = keyToReferenceStatuses;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.keyToReferenceStatuses")]
+        public IDictionary<string, ApiKVReference> KeyToReferenceStatuses { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs
new file mode 100644
index 000000000000..625646f05b9b
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/KeyVaultReferenceResource.cs
@@ -0,0 +1,122 @@
+// <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.WebSites.Models
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// Web app key vault reference and status ARM resource.
+    /// </summary>
+    [Rest.Serialization.JsonTransformation]
+    public partial class KeyVaultReferenceResource : ProxyOnlyResource
+    {
+        /// <summary>
+        /// Initializes a new instance of the KeyVaultReferenceResource class.
+        /// </summary>
+        public KeyVaultReferenceResource()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the KeyVaultReferenceResource class.
+        /// </summary>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource Name.</param>
+        /// <param name="kind">Kind of resource.</param>
+        /// <param name="type">Resource type.</param>
+        /// <param name="status">Possible values include: 'Initialized',
+        /// 'Resolved', 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound',
+        /// 'SecretNotFound', 'SecretVersionNotFound',
+        /// 'AccessToKeyVaultDenied', 'OtherReasons'</param>
+        /// <param name="identityType">Possible values include: 'None',
+        /// 'SystemAssigned', 'UserAssigned'</param>
+        /// <param name="source">Possible values include: 'KeyVault'</param>
+        /// <param name="location">Possible values include:
+        /// 'ApplicationSetting'</param>
+        public KeyVaultReferenceResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string reference = default(string), ResolveStatus? status = default(ResolveStatus?), string vaultName = default(string), string secretName = default(string), string secretVersion = default(string), ManagedServiceIdentityType? identityType = default(ManagedServiceIdentityType?), string details = default(string), ConfigReferenceSource? source = default(ConfigReferenceSource?), ConfigReferenceLocation? location = default(ConfigReferenceLocation?))
+            : base(id, name, kind, type)
+        {
+            Reference = reference;
+            Status = status;
+            VaultName = vaultName;
+            SecretName = secretName;
+            SecretVersion = secretVersion;
+            IdentityType = identityType;
+            Details = details;
+            Source = source;
+            Location = location;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.reference")]
+        public string Reference { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'Initialized', 'Resolved',
+        /// 'InvalidSyntax', 'MSINotEnabled', 'VaultNotFound',
+        /// 'SecretNotFound', 'SecretVersionNotFound',
+        /// 'AccessToKeyVaultDenied', 'OtherReasons'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.status")]
+        public ResolveStatus? Status { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.vaultName")]
+        public string VaultName { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.secretName")]
+        public string SecretName { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.secretVersion")]
+        public string SecretVersion { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'None', 'SystemAssigned',
+        /// 'UserAssigned'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.identityType")]
+        public ManagedServiceIdentityType? IdentityType { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.details")]
+        public string Details { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'KeyVault'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.source")]
+        public ConfigReferenceSource? Source { get; set; }
+
+        /// <summary>
+        /// Gets or sets possible values include: 'ApplicationSetting'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.location")]
+        public ConfigReferenceLocation? Location { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentity.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentity.cs
index 52912d503aa3..4cfd54166a17 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentity.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentity.cs
@@ -32,8 +32,7 @@ public ManagedServiceIdentity()
         /// Initializes a new instance of the ManagedServiceIdentity class.
         /// </summary>
         /// <param name="type">Type of managed service identity. Possible
-        /// values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
-        /// UserAssigned', 'None'</param>
+        /// values include: 'None', 'SystemAssigned', 'UserAssigned'</param>
         /// <param name="tenantId">Tenant of managed service identity.</param>
         /// <param name="principalId">Principal Id of managed service
         /// identity.</param>
@@ -41,7 +40,7 @@ public ManagedServiceIdentity()
         /// identities associated with the resource. The user identity
         /// dictionary key references will be ARM resource ids in the form:
         /// '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}</param>
-        public ManagedServiceIdentity(string type = default(string), string tenantId = default(string), string principalId = default(string), IDictionary<string, ManagedServiceIdentityUserAssignedIdentitiesValue> userAssignedIdentities = default(IDictionary<string, ManagedServiceIdentityUserAssignedIdentitiesValue>))
+        public ManagedServiceIdentity(ManagedServiceIdentityType? type = default(ManagedServiceIdentityType?), string tenantId = default(string), string principalId = default(string), IDictionary<string, ManagedServiceIdentityUserAssignedIdentitiesValue> userAssignedIdentities = default(IDictionary<string, ManagedServiceIdentityUserAssignedIdentitiesValue>))
         {
             Type = type;
             TenantId = tenantId;
@@ -57,11 +56,10 @@ public ManagedServiceIdentity()
 
         /// <summary>
         /// Gets or sets type of managed service identity. Possible values
-        /// include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
-        /// UserAssigned', 'None'
+        /// include: 'None', 'SystemAssigned', 'UserAssigned'
         /// </summary>
         [JsonProperty(PropertyName = "type")]
-        public string Type { get; set; }
+        public ManagedServiceIdentityType? Type { get; set; }
 
         /// <summary>
         /// Gets tenant of managed service identity.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentityType.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentityType.cs
index 9b9dc03e5efb..9b91a7579271 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentityType.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ManagedServiceIdentityType.cs
@@ -10,15 +10,57 @@
 
 namespace Microsoft.Azure.Management.WebSites.Models
 {
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System.Runtime;
+    using System.Runtime.Serialization;
 
     /// <summary>
     /// Defines values for ManagedServiceIdentityType.
     /// </summary>
-    public static class ManagedServiceIdentityType
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum ManagedServiceIdentityType
     {
-        public const string SystemAssigned = "SystemAssigned";
-        public const string UserAssigned = "UserAssigned";
-        public const string SystemAssignedUserAssigned = "SystemAssigned, UserAssigned";
-        public const string None = "None";
+        [EnumMember(Value = "None")]
+        None,
+        [EnumMember(Value = "SystemAssigned")]
+        SystemAssigned,
+        [EnumMember(Value = "UserAssigned")]
+        UserAssigned
+    }
+    internal static class ManagedServiceIdentityTypeEnumExtension
+    {
+        internal static string ToSerializedValue(this ManagedServiceIdentityType? value)
+        {
+            return value == null ? null : ((ManagedServiceIdentityType)value).ToSerializedValue();
+        }
+
+        internal static string ToSerializedValue(this ManagedServiceIdentityType value)
+        {
+            switch( value )
+            {
+                case ManagedServiceIdentityType.None:
+                    return "None";
+                case ManagedServiceIdentityType.SystemAssigned:
+                    return "SystemAssigned";
+                case ManagedServiceIdentityType.UserAssigned:
+                    return "UserAssigned";
+            }
+            return null;
+        }
+
+        internal static ManagedServiceIdentityType? ParseManagedServiceIdentityType(this string value)
+        {
+            switch( value )
+            {
+                case "None":
+                    return ManagedServiceIdentityType.None;
+                case "SystemAssigned":
+                    return ManagedServiceIdentityType.SystemAssigned;
+                case "UserAssigned":
+                    return ManagedServiceIdentityType.UserAssigned;
+            }
+            return null;
+        }
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricAvailabilily.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricAvailabilily.cs
deleted file mode 100644
index 215004e8840a..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricAvailabilily.cs
+++ /dev/null
@@ -1,60 +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.WebSites.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Metric availability and retention.
-    /// </summary>
-    public partial class MetricAvailabilily
-    {
-        /// <summary>
-        /// Initializes a new instance of the MetricAvailabilily class.
-        /// </summary>
-        public MetricAvailabilily()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the MetricAvailabilily class.
-        /// </summary>
-        /// <param name="timeGrain">Time grain.</param>
-        /// <param name="retention">Retention period for the current time
-        /// grain.</param>
-        public MetricAvailabilily(string timeGrain = default(string), string retention = default(string))
-        {
-            TimeGrain = timeGrain;
-            Retention = retention;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets time grain.
-        /// </summary>
-        [JsonProperty(PropertyName = "timeGrain")]
-        public string TimeGrain { get; set; }
-
-        /// <summary>
-        /// Gets or sets retention period for the current time grain.
-        /// </summary>
-        [JsonProperty(PropertyName = "retention")]
-        public string Retention { get; set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricDefinition.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricDefinition.cs
deleted file mode 100644
index b12a4bed7d0f..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricDefinition.cs
+++ /dev/null
@@ -1,88 +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.WebSites.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Metadata for a metric.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class MetricDefinition : ProxyOnlyResource
-    {
-        /// <summary>
-        /// Initializes a new instance of the MetricDefinition class.
-        /// </summary>
-        public MetricDefinition()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the MetricDefinition class.
-        /// </summary>
-        /// <param name="id">Resource Id.</param>
-        /// <param name="name">Resource Name.</param>
-        /// <param name="kind">Kind of resource.</param>
-        /// <param name="type">Resource type.</param>
-        /// <param name="unit">Unit of the metric.</param>
-        /// <param name="primaryAggregationType">Primary aggregation
-        /// type.</param>
-        /// <param name="metricAvailabilities">List of time grains supported
-        /// for the metric together with retention period.</param>
-        /// <param name="displayName">Friendly name shown in the UI.</param>
-        public MetricDefinition(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string unit = default(string), string primaryAggregationType = default(string), IList<MetricAvailabilily> metricAvailabilities = default(IList<MetricAvailabilily>), string displayName = default(string))
-            : base(id, name, kind, type)
-        {
-            Unit = unit;
-            PrimaryAggregationType = primaryAggregationType;
-            MetricAvailabilities = metricAvailabilities;
-            DisplayName = displayName;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets unit of the metric.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.unit")]
-        public string Unit { get; private set; }
-
-        /// <summary>
-        /// Gets primary aggregation type.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.primaryAggregationType")]
-        public string PrimaryAggregationType { get; private set; }
-
-        /// <summary>
-        /// Gets list of time grains supported for the metric together with
-        /// retention period.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.metricAvailabilities")]
-        public IList<MetricAvailabilily> MetricAvailabilities { get; private set; }
-
-        /// <summary>
-        /// Gets friendly name shown in the UI.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.displayName")]
-        public string DisplayName { get; private set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs
index 3cc68e360099..550a63993cb2 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/MetricSpecification.cs
@@ -31,7 +31,7 @@ public MetricSpecification()
         /// <summary>
         /// Initializes a new instance of the MetricSpecification class.
         /// </summary>
-        public MetricSpecification(string name = default(string), string displayName = default(string), string displayDescription = default(string), string unit = default(string), string aggregationType = default(string), bool? supportsInstanceLevelAggregation = default(bool?), bool? enableRegionalMdmAccount = default(bool?), string sourceMdmAccount = default(string), string sourceMdmNamespace = default(string), string metricFilterPattern = default(string), bool? fillGapWithZero = default(bool?), bool? isInternal = default(bool?), IList<Dimension> dimensions = default(IList<Dimension>), string category = default(string), IList<MetricAvailability> availabilities = default(IList<MetricAvailability>))
+        public MetricSpecification(string name = default(string), string displayName = default(string), string displayDescription = default(string), string unit = default(string), string aggregationType = default(string), bool? supportsInstanceLevelAggregation = default(bool?), bool? enableRegionalMdmAccount = default(bool?), string sourceMdmAccount = default(string), string sourceMdmNamespace = default(string), string metricFilterPattern = default(string), bool? fillGapWithZero = default(bool?), bool? isInternal = default(bool?), IList<Dimension> dimensions = default(IList<Dimension>), string category = default(string), IList<MetricAvailability> availabilities = default(IList<MetricAvailability>), IList<string> supportedTimeGrainTypes = default(IList<string>))
         {
             Name = name;
             DisplayName = displayName;
@@ -48,6 +48,7 @@ public MetricSpecification()
             Dimensions = dimensions;
             Category = category;
             Availabilities = availabilities;
+            SupportedTimeGrainTypes = supportedTimeGrainTypes;
             CustomInit();
         }
 
@@ -131,5 +132,10 @@ public MetricSpecification()
         [JsonProperty(PropertyName = "availabilities")]
         public IList<MetricAvailability> Availabilities { get; set; }
 
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "supportedTimeGrainTypes")]
+        public IList<string> SupportedTimeGrainTypes { get; set; }
+
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ProcessThreadInfo.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ProcessThreadInfo.cs
index 78133cb1e884..7e37d356eccf 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ProcessThreadInfo.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ProcessThreadInfo.cs
@@ -46,11 +46,9 @@ public ProcessThreadInfo()
         /// <param name="startTime">Start time.</param>
         /// <param name="totalProcessorTime">Total processor time.</param>
         /// <param name="userProcessorTime">User processor time.</param>
-        /// <param name="priviledgedProcessorTime">Privileged processor
-        /// time.</param>
         /// <param name="state">Thread state.</param>
         /// <param name="waitReason">Wait reason.</param>
-        public ProcessThreadInfo(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? identifier = default(int?), string href = default(string), string process = default(string), string startAddress = default(string), int? currentPriority = default(int?), string priorityLevel = default(string), int? basePriority = default(int?), System.DateTime? startTime = default(System.DateTime?), string totalProcessorTime = default(string), string userProcessorTime = default(string), string priviledgedProcessorTime = default(string), string state = default(string), string waitReason = default(string))
+        public ProcessThreadInfo(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? identifier = default(int?), string href = default(string), string process = default(string), string startAddress = default(string), int? currentPriority = default(int?), string priorityLevel = default(string), int? basePriority = default(int?), System.DateTime? startTime = default(System.DateTime?), string totalProcessorTime = default(string), string userProcessorTime = default(string), string state = default(string), string waitReason = default(string))
             : base(id, name, kind, type)
         {
             Identifier = identifier;
@@ -63,7 +61,6 @@ public ProcessThreadInfo()
             StartTime = startTime;
             TotalProcessorTime = totalProcessorTime;
             UserProcessorTime = userProcessorTime;
-            PriviledgedProcessorTime = priviledgedProcessorTime;
             State = state;
             WaitReason = waitReason;
             CustomInit();
@@ -134,12 +131,6 @@ public ProcessThreadInfo()
         [JsonProperty(PropertyName = "properties.user_processor_time")]
         public string UserProcessorTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets privileged processor time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.priviledged_processor_time")]
-        public string PriviledgedProcessorTime { get; set; }
-
         /// <summary>
         /// Gets or sets thread state.
         /// </summary>
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/RampUpRule.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/RampUpRule.cs
index 32eae14ef5a1..4647553a245d 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/RampUpRule.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/RampUpRule.cs
@@ -39,13 +39,13 @@ public RampUpRule()
         /// &lt;code&gt;ActionHostName&lt;/code&gt;.</param>
         /// <param name="changeStep">In auto ramp up scenario this is the step
         /// to add/remove from &lt;code&gt;ReroutePercentage&lt;/code&gt; until
-        /// it reaches
-        /// &lt;code&gt;MinReroutePercentage&lt;/code&gt; or
+        /// it reaches \n&lt;code&gt;MinReroutePercentage&lt;/code&gt; or
         /// &lt;code&gt;MaxReroutePercentage&lt;/code&gt;. Site metrics are
         /// checked every N minutes specified in
-        /// &lt;code&gt;ChangeIntervalInMinutes&lt;/code&gt;.
-        /// Custom decision algorithm can be provided in TiPCallback site
-        /// extension which URL can be specified in
+        /// &lt;code&gt;ChangeIntervalInMinutes&lt;/code&gt;.\nCustom decision
+        /// algorithm
+        /// can be provided in TiPCallback site extension which URL can be
+        /// specified in
         /// &lt;code&gt;ChangeDecisionCallbackUrl&lt;/code&gt;.</param>
         /// <param name="changeIntervalInMinutes">Specifies interval in minutes
         /// to reevaluate ReroutePercentage.</param>
@@ -98,12 +98,13 @@ public RampUpRule()
         /// add/remove from
         /// &amp;lt;code&amp;gt;ReroutePercentage&amp;lt;/code&amp;gt; until it
         /// reaches
-        /// &amp;lt;code&amp;gt;MinReroutePercentage&amp;lt;/code&amp;gt; or
+        /// \n&amp;lt;code&amp;gt;MinReroutePercentage&amp;lt;/code&amp;gt; or
         /// &amp;lt;code&amp;gt;MaxReroutePercentage&amp;lt;/code&amp;gt;. Site
         /// metrics are checked every N minutes specified in
-        /// &amp;lt;code&amp;gt;ChangeIntervalInMinutes&amp;lt;/code&amp;gt;.
-        /// Custom decision algorithm can be provided in TiPCallback site
-        /// extension which URL can be specified in
+        /// &amp;lt;code&amp;gt;ChangeIntervalInMinutes&amp;lt;/code&amp;gt;.\nCustom
+        /// decision algorithm
+        /// can be provided in TiPCallback site extension which URL can be
+        /// specified in
         /// &amp;lt;code&amp;gt;ChangeDecisionCallbackUrl&amp;lt;/code&amp;gt;.
         /// </summary>
         [JsonProperty(PropertyName = "changeStep")]
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs
new file mode 100644
index 000000000000..81b83077e212
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResolveStatus.cs
@@ -0,0 +1,102 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System.Runtime;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Defines values for ResolveStatus.
+    /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum ResolveStatus
+    {
+        [EnumMember(Value = "Initialized")]
+        Initialized,
+        [EnumMember(Value = "Resolved")]
+        Resolved,
+        [EnumMember(Value = "InvalidSyntax")]
+        InvalidSyntax,
+        [EnumMember(Value = "MSINotEnabled")]
+        MSINotEnabled,
+        [EnumMember(Value = "VaultNotFound")]
+        VaultNotFound,
+        [EnumMember(Value = "SecretNotFound")]
+        SecretNotFound,
+        [EnumMember(Value = "SecretVersionNotFound")]
+        SecretVersionNotFound,
+        [EnumMember(Value = "AccessToKeyVaultDenied")]
+        AccessToKeyVaultDenied,
+        [EnumMember(Value = "OtherReasons")]
+        OtherReasons
+    }
+    internal static class ResolveStatusEnumExtension
+    {
+        internal static string ToSerializedValue(this ResolveStatus? value)
+        {
+            return value == null ? null : ((ResolveStatus)value).ToSerializedValue();
+        }
+
+        internal static string ToSerializedValue(this ResolveStatus value)
+        {
+            switch( value )
+            {
+                case ResolveStatus.Initialized:
+                    return "Initialized";
+                case ResolveStatus.Resolved:
+                    return "Resolved";
+                case ResolveStatus.InvalidSyntax:
+                    return "InvalidSyntax";
+                case ResolveStatus.MSINotEnabled:
+                    return "MSINotEnabled";
+                case ResolveStatus.VaultNotFound:
+                    return "VaultNotFound";
+                case ResolveStatus.SecretNotFound:
+                    return "SecretNotFound";
+                case ResolveStatus.SecretVersionNotFound:
+                    return "SecretVersionNotFound";
+                case ResolveStatus.AccessToKeyVaultDenied:
+                    return "AccessToKeyVaultDenied";
+                case ResolveStatus.OtherReasons:
+                    return "OtherReasons";
+            }
+            return null;
+        }
+
+        internal static ResolveStatus? ParseResolveStatus(this string value)
+        {
+            switch( value )
+            {
+                case "Initialized":
+                    return ResolveStatus.Initialized;
+                case "Resolved":
+                    return ResolveStatus.Resolved;
+                case "InvalidSyntax":
+                    return ResolveStatus.InvalidSyntax;
+                case "MSINotEnabled":
+                    return ResolveStatus.MSINotEnabled;
+                case "VaultNotFound":
+                    return ResolveStatus.VaultNotFound;
+                case "SecretNotFound":
+                    return ResolveStatus.SecretNotFound;
+                case "SecretVersionNotFound":
+                    return ResolveStatus.SecretVersionNotFound;
+                case "AccessToKeyVaultDenied":
+                    return ResolveStatus.AccessToKeyVaultDenied;
+                case "OtherReasons":
+                    return ResolveStatus.OtherReasons;
+            }
+            return null;
+        }
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetric.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetric.cs
deleted file mode 100644
index 4b2b11ba11d8..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetric.cs
+++ /dev/null
@@ -1,119 +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.WebSites.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Object representing a metric for any resource .
-    /// </summary>
-    public partial class ResourceMetric
-    {
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetric class.
-        /// </summary>
-        public ResourceMetric()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetric class.
-        /// </summary>
-        /// <param name="name">Name of metric.</param>
-        /// <param name="unit">Metric unit.</param>
-        /// <param name="timeGrain">Metric granularity. E.g PT1H, PT5M,
-        /// P1D</param>
-        /// <param name="startTime">Metric start time.</param>
-        /// <param name="endTime">Metric end time.</param>
-        /// <param name="resourceId">Metric resource Id.</param>
-        /// <param name="id">Resource Id.</param>
-        /// <param name="metricValues">Metric values.</param>
-        /// <param name="properties">Resource metric properties
-        /// collection.</param>
-        public ResourceMetric(ResourceMetricName name = default(ResourceMetricName), string unit = default(string), string timeGrain = default(string), System.DateTime? startTime = default(System.DateTime?), System.DateTime? endTime = default(System.DateTime?), string resourceId = default(string), string id = default(string), IList<ResourceMetricValue> metricValues = default(IList<ResourceMetricValue>), IList<ResourceMetricProperty> properties = default(IList<ResourceMetricProperty>))
-        {
-            Name = name;
-            Unit = unit;
-            TimeGrain = timeGrain;
-            StartTime = startTime;
-            EndTime = endTime;
-            ResourceId = resourceId;
-            Id = id;
-            MetricValues = metricValues;
-            Properties = properties;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets name of metric.
-        /// </summary>
-        [JsonProperty(PropertyName = "name")]
-        public ResourceMetricName Name { get; private set; }
-
-        /// <summary>
-        /// Gets metric unit.
-        /// </summary>
-        [JsonProperty(PropertyName = "unit")]
-        public string Unit { get; private set; }
-
-        /// <summary>
-        /// Gets metric granularity. E.g PT1H, PT5M, P1D
-        /// </summary>
-        [JsonProperty(PropertyName = "timeGrain")]
-        public string TimeGrain { get; private set; }
-
-        /// <summary>
-        /// Gets metric start time.
-        /// </summary>
-        [JsonProperty(PropertyName = "startTime")]
-        public System.DateTime? StartTime { get; private set; }
-
-        /// <summary>
-        /// Gets metric end time.
-        /// </summary>
-        [JsonProperty(PropertyName = "endTime")]
-        public System.DateTime? EndTime { get; private set; }
-
-        /// <summary>
-        /// Gets metric resource Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "resourceId")]
-        public string ResourceId { get; private set; }
-
-        /// <summary>
-        /// Gets resource Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "id")]
-        public string Id { get; private set; }
-
-        /// <summary>
-        /// Gets metric values.
-        /// </summary>
-        [JsonProperty(PropertyName = "metricValues")]
-        public IList<ResourceMetricValue> MetricValues { get; private set; }
-
-        /// <summary>
-        /// Gets resource metric properties collection.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties")]
-        public IList<ResourceMetricProperty> Properties { get; private set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricName.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricName.cs
deleted file mode 100644
index 5682eb79e38a..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricName.cs
+++ /dev/null
@@ -1,59 +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.WebSites.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Name of a metric for any resource .
-    /// </summary>
-    public partial class ResourceMetricName
-    {
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetricName class.
-        /// </summary>
-        public ResourceMetricName()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetricName class.
-        /// </summary>
-        /// <param name="value">metric name value.</param>
-        /// <param name="localizedValue">Localized metric name value.</param>
-        public ResourceMetricName(string value = default(string), string localizedValue = default(string))
-        {
-            Value = value;
-            LocalizedValue = localizedValue;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets metric name value.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public string Value { get; private set; }
-
-        /// <summary>
-        /// Gets localized metric name value.
-        /// </summary>
-        [JsonProperty(PropertyName = "localizedValue")]
-        public string LocalizedValue { get; private set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricValue.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricValue.cs
deleted file mode 100644
index ae87949d9cd8..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ResourceMetricValue.cs
+++ /dev/null
@@ -1,102 +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.WebSites.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Value of resource metric.
-    /// </summary>
-    public partial class ResourceMetricValue
-    {
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetricValue class.
-        /// </summary>
-        public ResourceMetricValue()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ResourceMetricValue class.
-        /// </summary>
-        /// <param name="timestamp">Value timestamp.</param>
-        /// <param name="average">Value average.</param>
-        /// <param name="minimum">Value minimum.</param>
-        /// <param name="maximum">Value maximum.</param>
-        /// <param name="total">Value total.</param>
-        /// <param name="count">Value count.</param>
-        /// <param name="properties">Resource metric properties
-        /// collection.</param>
-        public ResourceMetricValue(string timestamp = default(string), double? average = default(double?), double? minimum = default(double?), double? maximum = default(double?), double? total = default(double?), double? count = default(double?), IList<ResourceMetricProperty> properties = default(IList<ResourceMetricProperty>))
-        {
-            Timestamp = timestamp;
-            Average = average;
-            Minimum = minimum;
-            Maximum = maximum;
-            Total = total;
-            Count = count;
-            Properties = properties;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets value timestamp.
-        /// </summary>
-        [JsonProperty(PropertyName = "timestamp")]
-        public string Timestamp { get; private set; }
-
-        /// <summary>
-        /// Gets value average.
-        /// </summary>
-        [JsonProperty(PropertyName = "average")]
-        public double? Average { get; private set; }
-
-        /// <summary>
-        /// Gets value minimum.
-        /// </summary>
-        [JsonProperty(PropertyName = "minimum")]
-        public double? Minimum { get; private set; }
-
-        /// <summary>
-        /// Gets value maximum.
-        /// </summary>
-        [JsonProperty(PropertyName = "maximum")]
-        public double? Maximum { get; private set; }
-
-        /// <summary>
-        /// Gets value total.
-        /// </summary>
-        [JsonProperty(PropertyName = "total")]
-        public double? Total { get; private set; }
-
-        /// <summary>
-        /// Gets value count.
-        /// </summary>
-        [JsonProperty(PropertyName = "count")]
-        public double? Count { get; private set; }
-
-        /// <summary>
-        /// Gets resource metric properties collection.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties")]
-        public IList<ResourceMetricProperty> Properties { get; private set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ScmType.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ScmType.cs
index 807794ab9da3..20a633dd2b81 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ScmType.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ScmType.cs
@@ -29,5 +29,6 @@ public static class ScmType
         public const string ExternalHg = "ExternalHg";
         public const string OneDrive = "OneDrive";
         public const string VSO = "VSO";
+        public const string VSTSRM = "VSTSRM";
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs
index 997c07700388..67d1813717fe 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/Site.cs
@@ -101,7 +101,8 @@ public Site()
         /// Read-only.</param>
         /// <param name="possibleOutboundIpAddresses">List of IP addresses that
         /// the app uses for outbound connections (e.g. database access).
-        /// Includes VIPs from all tenants. Read-only.</param>
+        /// Includes VIPs from all tenants except dataComponent.
+        /// Read-only.</param>
         /// <param name="containerSize">Size of the function container.</param>
         /// <param name="dailyMemoryTimeQuota">Maximum allowed daily
         /// memory-time quota (applicable on dynamic apps only).</param>
@@ -128,9 +129,7 @@ public Site()
         /// 'GeoRedundant'</param>
         /// <param name="inProgressOperationId">Specifies an operation id if
         /// this site has a pending operation.</param>
-        /// <param name="geoDistributions">GeoDistributions for this
-        /// site</param>
-        public Site(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string state = default(string), IList<string> hostNames = default(IList<string>), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList<string> enabledHostNames = default(IList<string>), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList<HostNameSslState> hostNameSslStates = default(IList<HostNameSslState>), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList<string> trafficManagerHostNames = default(IList<string>), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), IList<GeoDistribution> geoDistributions = default(IList<GeoDistribution>), ManagedServiceIdentity identity = default(ManagedServiceIdentity))
+        public Site(string location, string id = default(string), string name = default(string), string kind = default(string), string type = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), string state = default(string), IList<string> hostNames = default(IList<string>), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList<string> enabledHostNames = default(IList<string>), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList<HostNameSslState> hostNameSslStates = default(IList<HostNameSslState>), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList<string> trafficManagerHostNames = default(IList<string>), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity))
             : base(location, id, name, kind, type, tags)
         {
             State = state;
@@ -169,7 +168,6 @@ public Site()
             HttpsOnly = httpsOnly;
             RedundancyMode = redundancyMode;
             InProgressOperationId = inProgressOperationId;
-            GeoDistributions = geoDistributions;
             Identity = identity;
             CustomInit();
         }
@@ -353,8 +351,8 @@ public Site()
 
         /// <summary>
         /// Gets list of IP addresses that the app uses for outbound
-        /// connections (e.g. database access). Includes VIPs from all tenants.
-        /// Read-only.
+        /// connections (e.g. database access). Includes VIPs from all tenants
+        /// except dataComponent. Read-only.
         /// </summary>
         [JsonProperty(PropertyName = "properties.possibleOutboundIpAddresses")]
         public string PossibleOutboundIpAddresses { get; private set; }
@@ -440,12 +438,6 @@ public Site()
         [JsonProperty(PropertyName = "properties.inProgressOperationId")]
         public System.Guid? InProgressOperationId { get; private set; }
 
-        /// <summary>
-        /// Gets or sets geoDistributions for this site
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.geoDistributions")]
-        public IList<GeoDistribution> GeoDistributions { get; set; }
-
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "identity")]
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs
index 0883c2b1dc36..0780bad47daa 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfig.cs
@@ -63,8 +63,6 @@ public SiteConfig()
         /// &lt;code&gt;false&lt;/code&gt;.</param>
         /// <param name="publishingUsername">Publishing user name.</param>
         /// <param name="appSettings">Application settings.</param>
-        /// <param name="azureStorageAccounts">User-provided Azure storage
-        /// accounts.</param>
         /// <param name="connectionStrings">Connection strings.</param>
         /// <param name="machineKey">Site MachineKey.</param>
         /// <param name="handlerMappings">Handler mappings.</param>
@@ -72,7 +70,7 @@ public SiteConfig()
         /// <param name="scmType">SCM type. Possible values include: 'None',
         /// 'Dropbox', 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit',
         /// 'CodePlexHg', 'BitbucketGit', 'BitbucketHg', 'ExternalGit',
-        /// 'ExternalHg', 'OneDrive', 'VSO'</param>
+        /// 'ExternalHg', 'OneDrive', 'VSO', 'VSTSRM'</param>
         /// <param name="use32BitWorkerProcess">&lt;code&gt;true&lt;/code&gt;
         /// to use 32-bit worker process; otherwise,
         /// &lt;code&gt;false&lt;/code&gt;.</param>
@@ -104,6 +102,8 @@ public SiteConfig()
         /// <param name="push">Push endpoint settings.</param>
         /// <param name="apiDefinition">Information about the formal API
         /// definition for the app.</param>
+        /// <param name="apiManagementConfig">Azure API management settings
+        /// linked to the app.</param>
         /// <param name="autoSwapSlotName">Auto-swap slot name.</param>
         /// <param name="localMySqlEnabled">&lt;code&gt;true&lt;/code&gt; to
         /// enable local MySQL; otherwise,
@@ -125,9 +125,11 @@ public SiteConfig()
         /// '1.0', '1.1', '1.2'</param>
         /// <param name="ftpsState">State of FTP / FTPS service. Possible
         /// values include: 'AllAllowed', 'FtpsOnly', 'Disabled'</param>
-        /// <param name="reservedInstanceCount">Number of reserved instances.
-        /// This setting only applies to the Consumption Plan</param>
-        public SiteConfig(int? numberOfWorkers = default(int?), IList<string> defaultDocuments = default(IList<string>), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList<NameValuePair> appSettings = default(IList<NameValuePair>), IDictionary<string, AzureStorageInfoValue> azureStorageAccounts = default(IDictionary<string, AzureStorageInfoValue>), IList<ConnStringInfo> connectionStrings = default(IList<ConnStringInfo>), SiteMachineKey machineKey = default(SiteMachineKey), IList<HandlerMapping> handlerMappings = default(IList<HandlerMapping>), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList<VirtualApplication> virtualApplications = default(IList<VirtualApplication>), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList<IpSecurityRestriction> ipSecurityRestrictions = default(IList<IpSecurityRestriction>), IList<IpSecurityRestriction> scmIpSecurityRestrictions = default(IList<IpSecurityRestriction>), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? reservedInstanceCount = default(int?))
+        /// <param name="preWarmedInstanceCount">Number of preWarmed instances.
+        /// This setting only applies to the Consumption and Elastic
+        /// Plans</param>
+        /// <param name="healthCheckPath">Health check path</param>
+        public SiteConfig(int? numberOfWorkers = default(int?), IList<string> defaultDocuments = default(IList<string>), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList<NameValuePair> appSettings = default(IList<NameValuePair>), IList<ConnStringInfo> connectionStrings = default(IList<ConnStringInfo>), SiteMachineKey machineKey = default(SiteMachineKey), IList<HandlerMapping> handlerMappings = default(IList<HandlerMapping>), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList<VirtualApplication> virtualApplications = default(IList<VirtualApplication>), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList<IpSecurityRestriction> ipSecurityRestrictions = default(IList<IpSecurityRestriction>), IList<IpSecurityRestriction> scmIpSecurityRestrictions = default(IList<IpSecurityRestriction>), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string))
         {
             NumberOfWorkers = numberOfWorkers;
             DefaultDocuments = defaultDocuments;
@@ -146,7 +148,6 @@ public SiteConfig()
             DetailedErrorLoggingEnabled = detailedErrorLoggingEnabled;
             PublishingUsername = publishingUsername;
             AppSettings = appSettings;
-            AzureStorageAccounts = azureStorageAccounts;
             ConnectionStrings = connectionStrings;
             MachineKey = machineKey;
             HandlerMappings = handlerMappings;
@@ -171,6 +172,7 @@ public SiteConfig()
             Cors = cors;
             Push = push;
             ApiDefinition = apiDefinition;
+            ApiManagementConfig = apiManagementConfig;
             AutoSwapSlotName = autoSwapSlotName;
             LocalMySqlEnabled = localMySqlEnabled;
             ManagedServiceIdentityId = managedServiceIdentityId;
@@ -181,7 +183,8 @@ public SiteConfig()
             Http20Enabled = http20Enabled;
             MinTlsVersion = minTlsVersion;
             FtpsState = ftpsState;
-            ReservedInstanceCount = reservedInstanceCount;
+            PreWarmedInstanceCount = preWarmedInstanceCount;
+            HealthCheckPath = healthCheckPath;
             CustomInit();
         }
 
@@ -300,12 +303,6 @@ public SiteConfig()
         [JsonProperty(PropertyName = "appSettings")]
         public IList<NameValuePair> AppSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets user-provided Azure storage accounts.
-        /// </summary>
-        [JsonProperty(PropertyName = "azureStorageAccounts")]
-        public IDictionary<string, AzureStorageInfoValue> AzureStorageAccounts { get; set; }
-
         /// <summary>
         /// Gets or sets connection strings.
         /// </summary>
@@ -334,7 +331,7 @@ public SiteConfig()
         /// Gets or sets SCM type. Possible values include: 'None', 'Dropbox',
         /// 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit', 'CodePlexHg',
         /// 'BitbucketGit', 'BitbucketHg', 'ExternalGit', 'ExternalHg',
-        /// 'OneDrive', 'VSO'
+        /// 'OneDrive', 'VSO', 'VSTSRM'
         /// </summary>
         [JsonProperty(PropertyName = "scmType")]
         public string ScmType { get; set; }
@@ -465,6 +462,12 @@ public SiteConfig()
         [JsonProperty(PropertyName = "apiDefinition")]
         public ApiDefinitionInfo ApiDefinition { get; set; }
 
+        /// <summary>
+        /// Gets or sets azure API management settings linked to the app.
+        /// </summary>
+        [JsonProperty(PropertyName = "apiManagementConfig")]
+        public ApiManagementConfig ApiManagementConfig { get; set; }
+
         /// <summary>
         /// Gets or sets auto-swap slot name.
         /// </summary>
@@ -532,11 +535,17 @@ public SiteConfig()
         public string FtpsState { get; set; }
 
         /// <summary>
-        /// Gets or sets number of reserved instances.
-        /// This setting only applies to the Consumption Plan
+        /// Gets or sets number of preWarmed instances.
+        /// This setting only applies to the Consumption and Elastic Plans
+        /// </summary>
+        [JsonProperty(PropertyName = "preWarmedInstanceCount")]
+        public int? PreWarmedInstanceCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets health check path
         /// </summary>
-        [JsonProperty(PropertyName = "reservedInstanceCount")]
-        public int? ReservedInstanceCount { get; set; }
+        [JsonProperty(PropertyName = "healthCheckPath")]
+        public string HealthCheckPath { get; set; }
 
         /// <summary>
         /// Validate the object.
@@ -550,13 +559,13 @@ public virtual void Validate()
             {
                 Push.Validate();
             }
-            if (ReservedInstanceCount > 10)
+            if (PreWarmedInstanceCount > 10)
             {
-                throw new ValidationException(ValidationRules.InclusiveMaximum, "ReservedInstanceCount", 10);
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "PreWarmedInstanceCount", 10);
             }
-            if (ReservedInstanceCount < 0)
+            if (PreWarmedInstanceCount < 0)
             {
-                throw new ValidationException(ValidationRules.InclusiveMinimum, "ReservedInstanceCount", 0);
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "PreWarmedInstanceCount", 0);
             }
         }
     }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs
index 754b90507dc4..91bb00383cf6 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteConfigResource.cs
@@ -69,8 +69,6 @@ public SiteConfigResource()
         /// &lt;code&gt;false&lt;/code&gt;.</param>
         /// <param name="publishingUsername">Publishing user name.</param>
         /// <param name="appSettings">Application settings.</param>
-        /// <param name="azureStorageAccounts">User-provided Azure storage
-        /// accounts.</param>
         /// <param name="connectionStrings">Connection strings.</param>
         /// <param name="machineKey">Site MachineKey.</param>
         /// <param name="handlerMappings">Handler mappings.</param>
@@ -78,7 +76,7 @@ public SiteConfigResource()
         /// <param name="scmType">SCM type. Possible values include: 'None',
         /// 'Dropbox', 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit',
         /// 'CodePlexHg', 'BitbucketGit', 'BitbucketHg', 'ExternalGit',
-        /// 'ExternalHg', 'OneDrive', 'VSO'</param>
+        /// 'ExternalHg', 'OneDrive', 'VSO', 'VSTSRM'</param>
         /// <param name="use32BitWorkerProcess">&lt;code&gt;true&lt;/code&gt;
         /// to use 32-bit worker process; otherwise,
         /// &lt;code&gt;false&lt;/code&gt;.</param>
@@ -110,6 +108,8 @@ public SiteConfigResource()
         /// <param name="push">Push endpoint settings.</param>
         /// <param name="apiDefinition">Information about the formal API
         /// definition for the app.</param>
+        /// <param name="apiManagementConfig">Azure API management settings
+        /// linked to the app.</param>
         /// <param name="autoSwapSlotName">Auto-swap slot name.</param>
         /// <param name="localMySqlEnabled">&lt;code&gt;true&lt;/code&gt; to
         /// enable local MySQL; otherwise,
@@ -131,9 +131,11 @@ public SiteConfigResource()
         /// '1.0', '1.1', '1.2'</param>
         /// <param name="ftpsState">State of FTP / FTPS service. Possible
         /// values include: 'AllAllowed', 'FtpsOnly', 'Disabled'</param>
-        /// <param name="reservedInstanceCount">Number of reserved instances.
-        /// This setting only applies to the Consumption Plan</param>
-        public SiteConfigResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? numberOfWorkers = default(int?), IList<string> defaultDocuments = default(IList<string>), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList<NameValuePair> appSettings = default(IList<NameValuePair>), IDictionary<string, AzureStorageInfoValue> azureStorageAccounts = default(IDictionary<string, AzureStorageInfoValue>), IList<ConnStringInfo> connectionStrings = default(IList<ConnStringInfo>), SiteMachineKey machineKey = default(SiteMachineKey), IList<HandlerMapping> handlerMappings = default(IList<HandlerMapping>), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList<VirtualApplication> virtualApplications = default(IList<VirtualApplication>), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList<IpSecurityRestriction> ipSecurityRestrictions = default(IList<IpSecurityRestriction>), IList<IpSecurityRestriction> scmIpSecurityRestrictions = default(IList<IpSecurityRestriction>), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? reservedInstanceCount = default(int?))
+        /// <param name="preWarmedInstanceCount">Number of preWarmed instances.
+        /// This setting only applies to the Consumption and Elastic
+        /// Plans</param>
+        /// <param name="healthCheckPath">Health check path</param>
+        public SiteConfigResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), int? numberOfWorkers = default(int?), IList<string> defaultDocuments = default(IList<string>), string netFrameworkVersion = default(string), string phpVersion = default(string), string pythonVersion = default(string), string nodeVersion = default(string), string linuxFxVersion = default(string), string windowsFxVersion = default(string), bool? requestTracingEnabled = default(bool?), System.DateTime? requestTracingExpirationTime = default(System.DateTime?), bool? remoteDebuggingEnabled = default(bool?), string remoteDebuggingVersion = default(string), bool? httpLoggingEnabled = default(bool?), int? logsDirectorySizeLimit = default(int?), bool? detailedErrorLoggingEnabled = default(bool?), string publishingUsername = default(string), IList<NameValuePair> appSettings = default(IList<NameValuePair>), IList<ConnStringInfo> connectionStrings = default(IList<ConnStringInfo>), SiteMachineKey machineKey = default(SiteMachineKey), IList<HandlerMapping> handlerMappings = default(IList<HandlerMapping>), string documentRoot = default(string), string scmType = default(string), bool? use32BitWorkerProcess = default(bool?), bool? webSocketsEnabled = default(bool?), bool? alwaysOn = default(bool?), string javaVersion = default(string), string javaContainer = default(string), string javaContainerVersion = default(string), string appCommandLine = default(string), ManagedPipelineMode? managedPipelineMode = default(ManagedPipelineMode?), IList<VirtualApplication> virtualApplications = default(IList<VirtualApplication>), SiteLoadBalancing? loadBalancing = default(SiteLoadBalancing?), Experiments experiments = default(Experiments), SiteLimits limits = default(SiteLimits), bool? autoHealEnabled = default(bool?), AutoHealRules autoHealRules = default(AutoHealRules), string tracingOptions = default(string), string vnetName = default(string), CorsSettings cors = default(CorsSettings), PushSettings push = default(PushSettings), ApiDefinitionInfo apiDefinition = default(ApiDefinitionInfo), ApiManagementConfig apiManagementConfig = default(ApiManagementConfig), string autoSwapSlotName = default(string), bool? localMySqlEnabled = default(bool?), int? managedServiceIdentityId = default(int?), int? xManagedServiceIdentityId = default(int?), IList<IpSecurityRestriction> ipSecurityRestrictions = default(IList<IpSecurityRestriction>), IList<IpSecurityRestriction> scmIpSecurityRestrictions = default(IList<IpSecurityRestriction>), bool? scmIpSecurityRestrictionsUseMain = default(bool?), bool? http20Enabled = default(bool?), string minTlsVersion = default(string), string ftpsState = default(string), int? preWarmedInstanceCount = default(int?), string healthCheckPath = default(string))
             : base(id, name, kind, type)
         {
             NumberOfWorkers = numberOfWorkers;
@@ -153,7 +155,6 @@ public SiteConfigResource()
             DetailedErrorLoggingEnabled = detailedErrorLoggingEnabled;
             PublishingUsername = publishingUsername;
             AppSettings = appSettings;
-            AzureStorageAccounts = azureStorageAccounts;
             ConnectionStrings = connectionStrings;
             MachineKey = machineKey;
             HandlerMappings = handlerMappings;
@@ -178,6 +179,7 @@ public SiteConfigResource()
             Cors = cors;
             Push = push;
             ApiDefinition = apiDefinition;
+            ApiManagementConfig = apiManagementConfig;
             AutoSwapSlotName = autoSwapSlotName;
             LocalMySqlEnabled = localMySqlEnabled;
             ManagedServiceIdentityId = managedServiceIdentityId;
@@ -188,7 +190,8 @@ public SiteConfigResource()
             Http20Enabled = http20Enabled;
             MinTlsVersion = minTlsVersion;
             FtpsState = ftpsState;
-            ReservedInstanceCount = reservedInstanceCount;
+            PreWarmedInstanceCount = preWarmedInstanceCount;
+            HealthCheckPath = healthCheckPath;
             CustomInit();
         }
 
@@ -307,12 +310,6 @@ public SiteConfigResource()
         [JsonProperty(PropertyName = "properties.appSettings")]
         public IList<NameValuePair> AppSettings { get; set; }
 
-        /// <summary>
-        /// Gets or sets user-provided Azure storage accounts.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.azureStorageAccounts")]
-        public IDictionary<string, AzureStorageInfoValue> AzureStorageAccounts { get; set; }
-
         /// <summary>
         /// Gets or sets connection strings.
         /// </summary>
@@ -341,7 +338,7 @@ public SiteConfigResource()
         /// Gets or sets SCM type. Possible values include: 'None', 'Dropbox',
         /// 'Tfs', 'LocalGit', 'GitHub', 'CodePlexGit', 'CodePlexHg',
         /// 'BitbucketGit', 'BitbucketHg', 'ExternalGit', 'ExternalHg',
-        /// 'OneDrive', 'VSO'
+        /// 'OneDrive', 'VSO', 'VSTSRM'
         /// </summary>
         [JsonProperty(PropertyName = "properties.scmType")]
         public string ScmType { get; set; }
@@ -472,6 +469,12 @@ public SiteConfigResource()
         [JsonProperty(PropertyName = "properties.apiDefinition")]
         public ApiDefinitionInfo ApiDefinition { get; set; }
 
+        /// <summary>
+        /// Gets or sets azure API management settings linked to the app.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.apiManagementConfig")]
+        public ApiManagementConfig ApiManagementConfig { get; set; }
+
         /// <summary>
         /// Gets or sets auto-swap slot name.
         /// </summary>
@@ -539,11 +542,17 @@ public SiteConfigResource()
         public string FtpsState { get; set; }
 
         /// <summary>
-        /// Gets or sets number of reserved instances.
-        /// This setting only applies to the Consumption Plan
+        /// Gets or sets number of preWarmed instances.
+        /// This setting only applies to the Consumption and Elastic Plans
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.preWarmedInstanceCount")]
+        public int? PreWarmedInstanceCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets health check path
         /// </summary>
-        [JsonProperty(PropertyName = "properties.reservedInstanceCount")]
-        public int? ReservedInstanceCount { get; set; }
+        [JsonProperty(PropertyName = "properties.healthCheckPath")]
+        public string HealthCheckPath { get; set; }
 
         /// <summary>
         /// Validate the object.
@@ -557,13 +566,13 @@ public virtual void Validate()
             {
                 Push.Validate();
             }
-            if (ReservedInstanceCount > 10)
+            if (PreWarmedInstanceCount > 10)
             {
-                throw new ValidationException(ValidationRules.InclusiveMaximum, "ReservedInstanceCount", 10);
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "PreWarmedInstanceCount", 10);
             }
-            if (ReservedInstanceCount < 0)
+            if (PreWarmedInstanceCount < 0)
             {
-                throw new ValidationException(ValidationRules.InclusiveMinimum, "ReservedInstanceCount", 0);
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "PreWarmedInstanceCount", 0);
             }
         }
     }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs
index 2d8195fbe5c1..223c8c212225 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SitePatchResource.cs
@@ -99,7 +99,8 @@ public SitePatchResource()
         /// Read-only.</param>
         /// <param name="possibleOutboundIpAddresses">List of IP addresses that
         /// the app uses for outbound connections (e.g. database access).
-        /// Includes VIPs from all tenants. Read-only.</param>
+        /// Includes VIPs from all tenants except dataComponent.
+        /// Read-only.</param>
         /// <param name="containerSize">Size of the function container.</param>
         /// <param name="dailyMemoryTimeQuota">Maximum allowed daily
         /// memory-time quota (applicable on dynamic apps only).</param>
@@ -126,9 +127,7 @@ public SitePatchResource()
         /// 'GeoRedundant'</param>
         /// <param name="inProgressOperationId">Specifies an operation id if
         /// this site has a pending operation.</param>
-        /// <param name="geoDistributions">GeoDistributions for this
-        /// site</param>
-        public SitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string state = default(string), IList<string> hostNames = default(IList<string>), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList<string> enabledHostNames = default(IList<string>), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList<HostNameSslState> hostNameSslStates = default(IList<HostNameSslState>), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList<string> trafficManagerHostNames = default(IList<string>), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), IList<GeoDistribution> geoDistributions = default(IList<GeoDistribution>), ManagedServiceIdentity identity = default(ManagedServiceIdentity))
+        public SitePatchResource(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), string state = default(string), IList<string> hostNames = default(IList<string>), string repositorySiteName = default(string), UsageState? usageState = default(UsageState?), bool? enabled = default(bool?), IList<string> enabledHostNames = default(IList<string>), SiteAvailabilityState? availabilityState = default(SiteAvailabilityState?), IList<HostNameSslState> hostNameSslStates = default(IList<HostNameSslState>), string serverFarmId = default(string), bool? reserved = default(bool?), bool? isXenon = default(bool?), bool? hyperV = default(bool?), System.DateTime? lastModifiedTimeUtc = default(System.DateTime?), SiteConfig siteConfig = default(SiteConfig), IList<string> trafficManagerHostNames = default(IList<string>), bool? scmSiteAlsoStopped = default(bool?), string targetSwapSlot = default(string), HostingEnvironmentProfile hostingEnvironmentProfile = default(HostingEnvironmentProfile), bool? clientAffinityEnabled = default(bool?), bool? clientCertEnabled = default(bool?), string clientCertExclusionPaths = default(string), bool? hostNamesDisabled = default(bool?), string outboundIpAddresses = default(string), string possibleOutboundIpAddresses = default(string), int? containerSize = default(int?), int? dailyMemoryTimeQuota = default(int?), System.DateTime? suspendedTill = default(System.DateTime?), int? maxNumberOfWorkers = default(int?), CloningInfo cloningInfo = default(CloningInfo), string resourceGroup = default(string), bool? isDefaultContainer = default(bool?), string defaultHostName = default(string), SlotSwapStatus slotSwapStatus = default(SlotSwapStatus), bool? httpsOnly = default(bool?), RedundancyMode? redundancyMode = default(RedundancyMode?), System.Guid? inProgressOperationId = default(System.Guid?), ManagedServiceIdentity identity = default(ManagedServiceIdentity))
             : base(id, name, kind, type)
         {
             State = state;
@@ -167,7 +166,6 @@ public SitePatchResource()
             HttpsOnly = httpsOnly;
             RedundancyMode = redundancyMode;
             InProgressOperationId = inProgressOperationId;
-            GeoDistributions = geoDistributions;
             Identity = identity;
             CustomInit();
         }
@@ -351,8 +349,8 @@ public SitePatchResource()
 
         /// <summary>
         /// Gets list of IP addresses that the app uses for outbound
-        /// connections (e.g. database access). Includes VIPs from all tenants.
-        /// Read-only.
+        /// connections (e.g. database access). Includes VIPs from all tenants
+        /// except dataComponent. Read-only.
         /// </summary>
         [JsonProperty(PropertyName = "properties.possibleOutboundIpAddresses")]
         public string PossibleOutboundIpAddresses { get; private set; }
@@ -438,12 +436,6 @@ public SitePatchResource()
         [JsonProperty(PropertyName = "properties.inProgressOperationId")]
         public System.Guid? InProgressOperationId { get; private set; }
 
-        /// <summary>
-        /// Gets or sets geoDistributions for this site
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.geoDistributions")]
-        public IList<GeoDistribution> GeoDistributions { get; set; }
-
         /// <summary>
         /// </summary>
         [JsonProperty(PropertyName = "identity")]
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteRuntimeState.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteRuntimeState.cs
new file mode 100644
index 000000000000..06ddc43c58fe
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/SiteRuntimeState.cs
@@ -0,0 +1,66 @@
+// <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.WebSites.Models
+{
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Converters;
+    using System.Runtime;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Defines values for SiteRuntimeState.
+    /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum SiteRuntimeState
+    {
+        [EnumMember(Value = "READY")]
+        READY,
+        [EnumMember(Value = "STOPPED")]
+        STOPPED,
+        [EnumMember(Value = "UNKNOWN")]
+        UNKNOWN
+    }
+    internal static class SiteRuntimeStateEnumExtension
+    {
+        internal static string ToSerializedValue(this SiteRuntimeState? value)
+        {
+            return value == null ? null : ((SiteRuntimeState)value).ToSerializedValue();
+        }
+
+        internal static string ToSerializedValue(this SiteRuntimeState value)
+        {
+            switch( value )
+            {
+                case SiteRuntimeState.READY:
+                    return "READY";
+                case SiteRuntimeState.STOPPED:
+                    return "STOPPED";
+                case SiteRuntimeState.UNKNOWN:
+                    return "UNKNOWN";
+            }
+            return null;
+        }
+
+        internal static SiteRuntimeState? ParseSiteRuntimeState(this string value)
+        {
+            switch( value )
+            {
+                case "READY":
+                    return SiteRuntimeState.READY;
+                case "STOPPED":
+                    return SiteRuntimeState.STOPPED;
+                case "UNKNOWN":
+                    return SiteRuntimeState.UNKNOWN;
+            }
+            return null;
+        }
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMajorVersion.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMajorVersion.cs
index c5c7bded77ed..4bc2716c9e59 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMajorVersion.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMajorVersion.cs
@@ -43,13 +43,24 @@ public StackMajorVersion()
         /// <param name="applicationInsights">&lt;code&gt;true&lt;/code&gt; if
         /// this supports Application Insights; otherwise,
         /// &lt;code&gt;false&lt;/code&gt;.</param>
-        public StackMajorVersion(string displayVersion = default(string), string runtimeVersion = default(string), bool? isDefault = default(bool?), IList<StackMinorVersion> minorVersions = default(IList<StackMinorVersion>), bool? applicationInsights = default(bool?))
+        /// <param name="isPreview">&lt;code&gt;true&lt;/code&gt; if this stack
+        /// is in Preview, otherwise &lt;code&gt;false&lt;/code&gt;.</param>
+        /// <param name="isDeprecated">&lt;code&gt;true&lt;/code&gt; if this
+        /// stack has been deprecated, otherwise
+        /// &lt;code&gt;false&lt;/code&gt;.</param>
+        /// <param name="isHidden">&lt;code&gt;true&lt;/code&gt; if this stack
+        /// should be hidden for new customers on portal, otherwise
+        /// &lt;code&gt;false&lt;/code&gt;.</param>
+        public StackMajorVersion(string displayVersion = default(string), string runtimeVersion = default(string), bool? isDefault = default(bool?), IList<StackMinorVersion> minorVersions = default(IList<StackMinorVersion>), bool? applicationInsights = default(bool?), bool? isPreview = default(bool?), bool? isDeprecated = default(bool?), bool? isHidden = default(bool?))
         {
             DisplayVersion = displayVersion;
             RuntimeVersion = runtimeVersion;
             IsDefault = isDefault;
             MinorVersions = minorVersions;
             ApplicationInsights = applicationInsights;
+            IsPreview = isPreview;
+            IsDeprecated = isDeprecated;
+            IsHidden = isHidden;
             CustomInit();
         }
 
@@ -92,5 +103,29 @@ public StackMajorVersion()
         [JsonProperty(PropertyName = "applicationInsights")]
         public bool? ApplicationInsights { get; set; }
 
+        /// <summary>
+        /// Gets or sets &amp;lt;code&amp;gt;true&amp;lt;/code&amp;gt; if this
+        /// stack is in Preview, otherwise
+        /// &amp;lt;code&amp;gt;false&amp;lt;/code&amp;gt;.
+        /// </summary>
+        [JsonProperty(PropertyName = "isPreview")]
+        public bool? IsPreview { get; set; }
+
+        /// <summary>
+        /// Gets or sets &amp;lt;code&amp;gt;true&amp;lt;/code&amp;gt; if this
+        /// stack has been deprecated, otherwise
+        /// &amp;lt;code&amp;gt;false&amp;lt;/code&amp;gt;.
+        /// </summary>
+        [JsonProperty(PropertyName = "isDeprecated")]
+        public bool? IsDeprecated { get; set; }
+
+        /// <summary>
+        /// Gets or sets &amp;lt;code&amp;gt;true&amp;lt;/code&amp;gt; if this
+        /// stack should be hidden for new customers on portal, otherwise
+        /// &amp;lt;code&amp;gt;false&amp;lt;/code&amp;gt;.
+        /// </summary>
+        [JsonProperty(PropertyName = "isHidden")]
+        public bool? IsHidden { get; set; }
+
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMinorVersion.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMinorVersion.cs
index a4671b857f50..e10eae264017 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMinorVersion.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StackMinorVersion.cs
@@ -29,6 +29,7 @@ public StackMinorVersion()
         /// <summary>
         /// Initializes a new instance of the StackMinorVersion class.
         /// </summary>
+        /// <param name="testOnly">For test</param>
         /// <param name="displayVersion">Application stack minor version
         /// (display only).</param>
         /// <param name="runtimeVersion">Application stack minor version
@@ -40,8 +41,9 @@ public StackMinorVersion()
         /// name="isRemoteDebuggingEnabled">&lt;code&gt;true&lt;/code&gt; if
         /// this supports Remote Debugging, otherwise
         /// &lt;code&gt;false&lt;/code&gt;.</param>
-        public StackMinorVersion(string displayVersion = default(string), string runtimeVersion = default(string), bool? isDefault = default(bool?), bool? isRemoteDebuggingEnabled = default(bool?))
+        public StackMinorVersion(bool? testOnly = default(bool?), string displayVersion = default(string), string runtimeVersion = default(string), bool? isDefault = default(bool?), bool? isRemoteDebuggingEnabled = default(bool?))
         {
+            TestOnly = testOnly;
             DisplayVersion = displayVersion;
             RuntimeVersion = runtimeVersion;
             IsDefault = isDefault;
@@ -54,6 +56,12 @@ public StackMinorVersion()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets for test
+        /// </summary>
+        [JsonProperty(PropertyName = "testOnly")]
+        public bool? TestOnly { get; set; }
+
         /// <summary>
         /// Gets or sets application stack minor version (display only).
         /// </summary>
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StampCapacity.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StampCapacity.cs
index 6831437d92df..c775cdc8eb11 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StampCapacity.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/StampCapacity.cs
@@ -39,7 +39,7 @@ public StampCapacity()
         /// include: 'Shared', 'Dedicated', 'Dynamic'</param>
         /// <param name="workerSize">Size of the machines. Possible values
         /// include: 'Small', 'Medium', 'Large', 'D1', 'D2', 'D3',
-        /// 'Default'</param>
+        /// 'NestedSmall', 'Default'</param>
         /// <param name="workerSizeId">Size ID of machines:
         /// 0 - Small
         /// 1 - Medium
@@ -109,7 +109,8 @@ public StampCapacity()
 
         /// <summary>
         /// Gets or sets size of the machines. Possible values include:
-        /// 'Small', 'Medium', 'Large', 'D1', 'D2', 'D3', 'Default'
+        /// 'Small', 'Medium', 'Large', 'D1', 'D2', 'D3', 'NestedSmall',
+        /// 'Default'
         /// </summary>
         [JsonProperty(PropertyName = "workerSize")]
         public WorkerSizeOptions? WorkerSize { get; set; }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateContainerSettingsRequest.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateContainerSettingsRequest.cs
deleted file mode 100644
index f5b192827a93..000000000000
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateContainerSettingsRequest.cs
+++ /dev/null
@@ -1,95 +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.WebSites.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Container settings validation request context
-    /// </summary>
-    public partial class ValidateContainerSettingsRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the ValidateContainerSettingsRequest
-        /// class.
-        /// </summary>
-        public ValidateContainerSettingsRequest()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ValidateContainerSettingsRequest
-        /// class.
-        /// </summary>
-        /// <param name="baseUrl">Base URL of the container registry</param>
-        /// <param name="username">Username for to access the container
-        /// registry</param>
-        /// <param name="password">Password for to access the container
-        /// registry</param>
-        /// <param name="repository">Repository name (image name)</param>
-        /// <param name="tag">Image tag</param>
-        /// <param name="platform">Platform (windows or linux)</param>
-        public ValidateContainerSettingsRequest(string baseUrl = default(string), string username = default(string), string password = default(string), string repository = default(string), string tag = default(string), string platform = default(string))
-        {
-            BaseUrl = baseUrl;
-            Username = username;
-            Password = password;
-            Repository = repository;
-            Tag = tag;
-            Platform = platform;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets base URL of the container registry
-        /// </summary>
-        [JsonProperty(PropertyName = "baseUrl")]
-        public string BaseUrl { get; set; }
-
-        /// <summary>
-        /// Gets or sets username for to access the container registry
-        /// </summary>
-        [JsonProperty(PropertyName = "username")]
-        public string Username { get; set; }
-
-        /// <summary>
-        /// Gets or sets password for to access the container registry
-        /// </summary>
-        [JsonProperty(PropertyName = "password")]
-        public string Password { get; set; }
-
-        /// <summary>
-        /// Gets or sets repository name (image name)
-        /// </summary>
-        [JsonProperty(PropertyName = "repository")]
-        public string Repository { get; set; }
-
-        /// <summary>
-        /// Gets or sets image tag
-        /// </summary>
-        [JsonProperty(PropertyName = "tag")]
-        public string Tag { get; set; }
-
-        /// <summary>
-        /// Gets or sets platform (windows or linux)
-        /// </summary>
-        [JsonProperty(PropertyName = "platform")]
-        public string Platform { get; set; }
-
-    }
-}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateRequest.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateRequest.cs
index 1f3faf4c1f59..a582a0780b0e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateRequest.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/ValidateRequest.cs
@@ -52,7 +52,18 @@ public ValidateRequest()
         /// where app or App Service plan should be created.</param>
         /// <param name="isXenon">&lt;code&gt;true&lt;/code&gt; if App Service
         /// plan is running as a windows container</param>
-        public ValidateRequest(string name, string type, string location, string serverFarmId = default(string), string skuName = default(string), bool? needLinuxWorkers = default(bool?), bool? isSpot = default(bool?), int? capacity = default(int?), string hostingEnvironment = default(string), bool? isXenon = default(bool?))
+        /// <param name="containerRegistryBaseUrl">Base URL of the container
+        /// registry</param>
+        /// <param name="containerRegistryUsername">Username for to access the
+        /// container registry</param>
+        /// <param name="containerRegistryPassword">Password for to access the
+        /// container registry</param>
+        /// <param name="containerImageRepository">Repository name (image
+        /// name)</param>
+        /// <param name="containerImageTag">Image tag</param>
+        /// <param name="containerImagePlatform">Platform (windows or
+        /// linux)</param>
+        public ValidateRequest(string name, string type, string location, string serverFarmId = default(string), string skuName = default(string), bool? needLinuxWorkers = default(bool?), bool? isSpot = default(bool?), int? capacity = default(int?), string hostingEnvironment = default(string), bool? isXenon = default(bool?), string containerRegistryBaseUrl = default(string), string containerRegistryUsername = default(string), string containerRegistryPassword = default(string), string containerImageRepository = default(string), string containerImageTag = default(string), string containerImagePlatform = default(string))
         {
             Name = name;
             Type = type;
@@ -64,6 +75,12 @@ public ValidateRequest()
             Capacity = capacity;
             HostingEnvironment = hostingEnvironment;
             IsXenon = isXenon;
+            ContainerRegistryBaseUrl = containerRegistryBaseUrl;
+            ContainerRegistryUsername = containerRegistryUsername;
+            ContainerRegistryPassword = containerRegistryPassword;
+            ContainerImageRepository = containerImageRepository;
+            ContainerImageTag = containerImageTag;
+            ContainerImagePlatform = containerImagePlatform;
             CustomInit();
         }
 
@@ -141,6 +158,42 @@ public ValidateRequest()
         [JsonProperty(PropertyName = "properties.isXenon")]
         public bool? IsXenon { get; set; }
 
+        /// <summary>
+        /// Gets or sets base URL of the container registry
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerRegistryBaseUrl")]
+        public string ContainerRegistryBaseUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets username for to access the container registry
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerRegistryUsername")]
+        public string ContainerRegistryUsername { get; set; }
+
+        /// <summary>
+        /// Gets or sets password for to access the container registry
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerRegistryPassword")]
+        public string ContainerRegistryPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets repository name (image name)
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerImageRepository")]
+        public string ContainerImageRepository { get; set; }
+
+        /// <summary>
+        /// Gets or sets image tag
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerImageTag")]
+        public string ContainerImageTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets platform (windows or linux)
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerImagePlatform")]
+        public string ContainerImagePlatform { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VirtualIPMapping.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VirtualIPMapping.cs
index e7a882b12b99..c5d70ef7c71e 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VirtualIPMapping.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/VirtualIPMapping.cs
@@ -33,12 +33,15 @@ public VirtualIPMapping()
         /// <param name="internalHttpPort">Internal HTTP port.</param>
         /// <param name="internalHttpsPort">Internal HTTPS port.</param>
         /// <param name="inUse">Is virtual IP mapping in use.</param>
-        public VirtualIPMapping(string virtualIP = default(string), int? internalHttpPort = default(int?), int? internalHttpsPort = default(int?), bool? inUse = default(bool?))
+        /// <param name="serviceName">name of the service that virtual IP is
+        /// assigned to</param>
+        public VirtualIPMapping(string virtualIP = default(string), int? internalHttpPort = default(int?), int? internalHttpsPort = default(int?), bool? inUse = default(bool?), string serviceName = default(string))
         {
             VirtualIP = virtualIP;
             InternalHttpPort = internalHttpPort;
             InternalHttpsPort = internalHttpsPort;
             InUse = inUse;
+            ServiceName = serviceName;
             CustomInit();
         }
 
@@ -71,5 +74,11 @@ public VirtualIPMapping()
         [JsonProperty(PropertyName = "inUse")]
         public bool? InUse { get; set; }
 
+        /// <summary>
+        /// Gets or sets name of the service that virtual IP is assigned to
+        /// </summary>
+        [JsonProperty(PropertyName = "serviceName")]
+        public string ServiceName { get; set; }
+
     }
 }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs
new file mode 100644
index 000000000000..797a5dda35b8
--- /dev/null
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WebSiteInstanceStatus.cs
@@ -0,0 +1,91 @@
+// <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.WebSites.Models
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    [Rest.Serialization.JsonTransformation]
+    public partial class WebSiteInstanceStatus : ProxyOnlyResource
+    {
+        /// <summary>
+        /// Initializes a new instance of the WebSiteInstanceStatus class.
+        /// </summary>
+        public WebSiteInstanceStatus()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the WebSiteInstanceStatus class.
+        /// </summary>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource Name.</param>
+        /// <param name="kind">Kind of resource.</param>
+        /// <param name="type">Resource type.</param>
+        /// <param name="state">Possible values include: 'READY', 'STOPPED',
+        /// 'UNKNOWN'</param>
+        /// <param name="statusUrl">Link to the GetStatusApi in Kudu</param>
+        /// <param name="detectorUrl">Link to the Diagnose and Solve
+        /// Portal</param>
+        /// <param name="consoleUrl">Link to the Diagnose and Solve
+        /// Portal</param>
+        public WebSiteInstanceStatus(string id = default(string), string name = default(string), string kind = default(string), string type = default(string), SiteRuntimeState? state = default(SiteRuntimeState?), string statusUrl = default(string), string detectorUrl = default(string), string consoleUrl = default(string), IDictionary<string, ContainerInfo> containers = default(IDictionary<string, ContainerInfo>))
+            : base(id, name, kind, type)
+        {
+            State = state;
+            StatusUrl = statusUrl;
+            DetectorUrl = detectorUrl;
+            ConsoleUrl = consoleUrl;
+            Containers = containers;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets possible values include: 'READY', 'STOPPED', 'UNKNOWN'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.state")]
+        public SiteRuntimeState? State { get; set; }
+
+        /// <summary>
+        /// Gets or sets link to the GetStatusApi in Kudu
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.statusUrl")]
+        public string StatusUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets link to the Diagnose and Solve Portal
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.detectorUrl")]
+        public string DetectorUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets link to the Diagnose and Solve Portal
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.consoleUrl")]
+        public string ConsoleUrl { get; set; }
+
+        /// <summary>
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containers")]
+        public IDictionary<string, ContainerInfo> Containers { get; set; }
+
+    }
+}
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WorkerSizeOptions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WorkerSizeOptions.cs
index 478f9c2c539b..32d869df6f66 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WorkerSizeOptions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/Models/WorkerSizeOptions.cs
@@ -33,6 +33,8 @@ public enum WorkerSizeOptions
         D2,
         [EnumMember(Value = "D3")]
         D3,
+        [EnumMember(Value = "NestedSmall")]
+        NestedSmall,
         [EnumMember(Value = "Default")]
         Default
     }
@@ -59,6 +61,8 @@ internal static string ToSerializedValue(this WorkerSizeOptions value)
                     return "D2";
                 case WorkerSizeOptions.D3:
                     return "D3";
+                case WorkerSizeOptions.NestedSmall:
+                    return "NestedSmall";
                 case WorkerSizeOptions.Default:
                     return "Default";
             }
@@ -81,6 +85,8 @@ internal static string ToSerializedValue(this WorkerSizeOptions value)
                     return WorkerSizeOptions.D2;
                 case "D3":
                     return WorkerSizeOptions.D3;
+                case "NestedSmall":
+                    return WorkerSizeOptions.NestedSmall;
                 case "Default":
                     return WorkerSizeOptions.Default;
             }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperations.cs
index 0b46f9705115..547de71de032 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperations.cs
@@ -54,7 +54,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their versions
         /// </remarks>
         /// <param name='osTypeSelected'>
         /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
@@ -72,12 +72,21 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -86,7 +95,6 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("osTypeSelected", osTypeSelected);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetAvailableStacks", tracingParameters);
             }
@@ -98,9 +106,9 @@ internal ProviderOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("osTypeSelected={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(osTypeSelected, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -190,7 +198,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ApplicationStack>>();
+            var _result = new AzureOperationResponse<IPage<ApplicationStackResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -203,7 +211,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStack>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStackResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -227,8 +235,8 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// exposes resource metric definitions
         /// </summary>
         /// <remarks>
-        /// Gets all available operations for the Microsoft.Web resource provider. Also
-        /// exposes resource metric definitions
+        /// Description for Gets all available operations for the Microsoft.Web
+        /// resource provider. Also exposes resource metric definitions
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -242,12 +250,21 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
         public async Task<AzureOperationResponse<IPage<CsmOperationDescription>>> ListOperationsWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -255,7 +272,6 @@ internal ProviderOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters);
             }
@@ -263,9 +279,9 @@ internal ProviderOperations(WebSiteManagementClient client)
             var _baseUrl = Client.BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/operations").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -391,7 +407,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their versions
         /// </remarks>
         /// <param name='osTypeSelected'>
         /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
@@ -418,13 +434,16 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksOnPremWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksOnPremWithHttpMessagesAsync(string osTypeSelected = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -433,7 +452,6 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("osTypeSelected", osTypeSelected);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetAvailableStacksOnPrem", tracingParameters);
             }
@@ -446,9 +464,9 @@ internal ProviderOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("osTypeSelected={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(osTypeSelected, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -538,7 +556,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ApplicationStack>>();
+            var _result = new AzureOperationResponse<IPage<ApplicationStackResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -551,7 +569,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStack>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStackResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -574,7 +592,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their versions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -600,7 +618,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -709,7 +727,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ApplicationStack>>();
+            var _result = new AzureOperationResponse<IPage<ApplicationStackResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -722,7 +740,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStack>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStackResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -746,8 +764,8 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// exposes resource metric definitions
         /// </summary>
         /// <remarks>
-        /// Gets all available operations for the Microsoft.Web resource provider. Also
-        /// exposes resource metric definitions
+        /// Description for Gets all available operations for the Microsoft.Web
+        /// resource provider. Also exposes resource metric definitions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -918,7 +936,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// Get available application frameworks and their versions
         /// </summary>
         /// <remarks>
-        /// Get available application frameworks and their versions
+        /// Description for Get available application frameworks and their versions
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -944,7 +962,7 @@ internal ProviderOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ApplicationStack>>> GetAvailableStacksOnPremNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ApplicationStackResource>>> GetAvailableStacksOnPremNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -1053,7 +1071,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ApplicationStack>>();
+            var _result = new AzureOperationResponse<IPage<ApplicationStackResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1066,7 +1084,7 @@ internal ProviderOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStack>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ApplicationStackResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperationsExtensions.cs
index 56c6fe3b6d2c..0e9f90c4e7ac 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ProviderOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class ProviderOperationsExtensions
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -34,7 +34,7 @@ public static partial class ProviderOperationsExtensions
             /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
             /// 'LinuxFunctions'
             /// </param>
-            public static IPage<ApplicationStack> GetAvailableStacks(this IProviderOperations operations, string osTypeSelected = default(string))
+            public static IPage<ApplicationStackResource> GetAvailableStacks(this IProviderOperations operations, string osTypeSelected = default(string))
             {
                 return operations.GetAvailableStacksAsync(osTypeSelected).GetAwaiter().GetResult();
             }
@@ -43,7 +43,7 @@ public static partial class ProviderOperationsExtensions
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -55,7 +55,7 @@ public static partial class ProviderOperationsExtensions
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ApplicationStack>> GetAvailableStacksAsync(this IProviderOperations operations, string osTypeSelected = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ApplicationStackResource>> GetAvailableStacksAsync(this IProviderOperations operations, string osTypeSelected = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetAvailableStacksWithHttpMessagesAsync(osTypeSelected, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -68,8 +68,8 @@ public static partial class ProviderOperationsExtensions
             /// exposes resource metric definitions
             /// </summary>
             /// <remarks>
-            /// Gets all available operations for the Microsoft.Web resource provider. Also
-            /// exposes resource metric definitions
+            /// Description for Gets all available operations for the Microsoft.Web
+            /// resource provider. Also exposes resource metric definitions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -84,8 +84,8 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// exposes resource metric definitions
             /// </summary>
             /// <remarks>
-            /// Gets all available operations for the Microsoft.Web resource provider. Also
-            /// exposes resource metric definitions
+            /// Description for Gets all available operations for the Microsoft.Web
+            /// resource provider. Also exposes resource metric definitions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -105,7 +105,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -114,7 +114,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// Possible values include: 'Windows', 'Linux', 'WindowsFunctions',
             /// 'LinuxFunctions'
             /// </param>
-            public static IPage<ApplicationStack> GetAvailableStacksOnPrem(this IProviderOperations operations, string osTypeSelected = default(string))
+            public static IPage<ApplicationStackResource> GetAvailableStacksOnPrem(this IProviderOperations operations, string osTypeSelected = default(string))
             {
                 return operations.GetAvailableStacksOnPremAsync(osTypeSelected).GetAwaiter().GetResult();
             }
@@ -123,7 +123,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -135,7 +135,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ApplicationStack>> GetAvailableStacksOnPremAsync(this IProviderOperations operations, string osTypeSelected = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ApplicationStackResource>> GetAvailableStacksOnPremAsync(this IProviderOperations operations, string osTypeSelected = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetAvailableStacksOnPremWithHttpMessagesAsync(osTypeSelected, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -147,7 +147,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -155,7 +155,7 @@ public static IPage<CsmOperationDescription> ListOperations(this IProviderOperat
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<ApplicationStack> GetAvailableStacksNext(this IProviderOperations operations, string nextPageLink)
+            public static IPage<ApplicationStackResource> GetAvailableStacksNext(this IProviderOperations operations, string nextPageLink)
             {
                 return operations.GetAvailableStacksNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
@@ -164,7 +164,7 @@ public static IPage<ApplicationStack> GetAvailableStacksNext(this IProviderOpera
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -175,7 +175,7 @@ public static IPage<ApplicationStack> GetAvailableStacksNext(this IProviderOpera
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ApplicationStack>> GetAvailableStacksNextAsync(this IProviderOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ApplicationStackResource>> GetAvailableStacksNextAsync(this IProviderOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetAvailableStacksNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -188,8 +188,8 @@ public static IPage<ApplicationStack> GetAvailableStacksNext(this IProviderOpera
             /// exposes resource metric definitions
             /// </summary>
             /// <remarks>
-            /// Gets all available operations for the Microsoft.Web resource provider. Also
-            /// exposes resource metric definitions
+            /// Description for Gets all available operations for the Microsoft.Web
+            /// resource provider. Also exposes resource metric definitions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -207,8 +207,8 @@ public static IPage<CsmOperationDescription> ListOperationsNext(this IProviderOp
             /// exposes resource metric definitions
             /// </summary>
             /// <remarks>
-            /// Gets all available operations for the Microsoft.Web resource provider. Also
-            /// exposes resource metric definitions
+            /// Description for Gets all available operations for the Microsoft.Web
+            /// resource provider. Also exposes resource metric definitions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -231,7 +231,7 @@ public static IPage<CsmOperationDescription> ListOperationsNext(this IProviderOp
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -239,7 +239,7 @@ public static IPage<CsmOperationDescription> ListOperationsNext(this IProviderOp
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<ApplicationStack> GetAvailableStacksOnPremNext(this IProviderOperations operations, string nextPageLink)
+            public static IPage<ApplicationStackResource> GetAvailableStacksOnPremNext(this IProviderOperations operations, string nextPageLink)
             {
                 return operations.GetAvailableStacksOnPremNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
@@ -248,7 +248,7 @@ public static IPage<ApplicationStack> GetAvailableStacksOnPremNext(this IProvide
             /// Get available application frameworks and their versions
             /// </summary>
             /// <remarks>
-            /// Get available application frameworks and their versions
+            /// Description for Get available application frameworks and their versions
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -259,7 +259,7 @@ public static IPage<ApplicationStack> GetAvailableStacksOnPremNext(this IProvide
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ApplicationStack>> GetAvailableStacksOnPremNextAsync(this IProviderOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ApplicationStackResource>> GetAvailableStacksOnPremNextAsync(this IProviderOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.GetAvailableStacksOnPremNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs
index 115ce624deb7..bb8740936944 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperations.cs
@@ -54,7 +54,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// List all recommendations for a subscription.
         /// </summary>
         /// <remarks>
-        /// List all recommendations for a subscription.
+        /// Description for List all recommendations for a subscription.
         /// </remarks>
         /// <param name='featured'>
         /// Specify &lt;code&gt;true&lt;/code&gt; to return only the most critical
@@ -94,7 +94,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -104,7 +107,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("featured", featured);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -121,9 +123,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -249,7 +251,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Reset all recommendation opt-out settings for a subscription.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for a subscription.
+        /// Description for Reset all recommendation opt-out settings for a
+        /// subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -257,7 +260,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -275,7 +278,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -283,7 +289,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResetAllFilters", tracingParameters);
             }
@@ -292,9 +297,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/recommendations/reset").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -356,14 +361,13 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -373,10 +377,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -408,8 +408,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// future.
         /// </summary>
         /// <remarks>
-        /// Disables the specified rule so it will not apply to a subscription in the
-        /// future.
+        /// Description for Disables the specified rule so it will not apply to a
+        /// subscription in the future.
         /// </remarks>
         /// <param name='name'>
         /// Rule name
@@ -420,7 +420,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -442,7 +442,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -451,7 +454,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DisableRecommendationForSubscription", tracingParameters);
             }
@@ -461,9 +463,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -525,14 +527,13 @@ internal RecommendationsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -542,10 +543,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -577,8 +574,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the time
-        /// range.
+        /// Description for Get past recommendations for an app, optionally specified
+        /// by the time range.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -647,7 +644,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -659,7 +659,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("hostingEnvironmentName", hostingEnvironmentName);
                 tracingParameters.Add("expiredOnly", expiredOnly);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHistoryForHostingEnvironment", tracingParameters);
             }
@@ -678,9 +677,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -806,7 +805,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -874,7 +873,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -886,7 +888,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("hostingEnvironmentName", hostingEnvironmentName);
                 tracingParameters.Add("featured", featured);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListRecommendedRulesForHostingEnvironment", tracingParameters);
             }
@@ -905,9 +906,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1033,7 +1034,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Disable all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Disable all recommendations for an app.
+        /// Description for Disable all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1049,7 +1050,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1094,7 +1095,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1105,7 +1109,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("environmentName", environmentName);
                 tracingParameters.Add("hostingEnvironmentName", hostingEnvironmentName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DisableAllForHostingEnvironment", tracingParameters);
             }
@@ -1120,9 +1123,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("environmentName={0}", System.Uri.EscapeDataString(environmentName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1184,14 +1187,13 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1201,10 +1203,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -1235,7 +1233,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Reset all recommendation opt-out settings for an app.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for an app.
+        /// Description for Reset all recommendation opt-out settings for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1251,7 +1249,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1296,7 +1294,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1307,7 +1308,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("environmentName", environmentName);
                 tracingParameters.Add("hostingEnvironmentName", hostingEnvironmentName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResetAllFiltersForHostingEnvironment", tracingParameters);
             }
@@ -1322,9 +1322,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("environmentName={0}", System.Uri.EscapeDataString(environmentName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1386,14 +1386,13 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1403,10 +1402,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -1437,7 +1432,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get a recommendation rule for an app.
         /// </summary>
         /// <remarks>
-        /// Get a recommendation rule for an app.
+        /// Description for Get a recommendation rule for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1510,7 +1505,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1523,7 +1521,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("updateSeen", updateSeen);
                 tracingParameters.Add("recommendationId", recommendationId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetRuleDetailsByHostingEnvironment", tracingParameters);
             }
@@ -1543,9 +1540,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("recommendationId={0}", System.Uri.EscapeDataString(recommendationId)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1671,7 +1668,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Disables the specific rule for a web site permanently.
         /// </summary>
         /// <remarks>
-        /// Disables the specific rule for a web site permanently.
+        /// Description for Disables the specific rule for a web site permanently.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1690,7 +1687,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1739,7 +1736,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1751,7 +1751,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("environmentName", environmentName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostingEnvironmentName", hostingEnvironmentName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DisableRecommendationForHostingEnvironment", tracingParameters);
             }
@@ -1767,9 +1766,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("environmentName={0}", System.Uri.EscapeDataString(environmentName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1831,14 +1830,13 @@ internal RecommendationsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1848,10 +1846,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -1883,8 +1877,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the time
-        /// range.
+        /// Description for Get past recommendations for an app, optionally specified
+        /// by the time range.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1953,7 +1947,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1965,7 +1962,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("expiredOnly", expiredOnly);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHistoryForWebApp", tracingParameters);
             }
@@ -1984,9 +1980,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2112,7 +2108,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2180,7 +2176,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2192,7 +2191,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("featured", featured);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListRecommendedRulesForWebApp", tracingParameters);
             }
@@ -2211,9 +2209,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2339,7 +2337,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Disable all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Disable all recommendations for an app.
+        /// Description for Disable all recommendations for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2353,7 +2351,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2394,7 +2392,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2404,7 +2405,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DisableAllForWebApp", tracingParameters);
             }
@@ -2415,9 +2415,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteName}", System.Uri.EscapeDataString(siteName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2479,14 +2479,13 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2496,10 +2495,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -2530,7 +2525,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Reset all recommendation opt-out settings for an app.
         /// </summary>
         /// <remarks>
-        /// Reset all recommendation opt-out settings for an app.
+        /// Description for Reset all recommendation opt-out settings for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2544,7 +2539,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2585,7 +2580,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2595,7 +2593,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResetAllFiltersForWebApp", tracingParameters);
             }
@@ -2606,9 +2603,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteName}", System.Uri.EscapeDataString(siteName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2670,14 +2667,13 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2687,10 +2683,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -2721,7 +2713,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get a recommendation rule for an app.
         /// </summary>
         /// <remarks>
-        /// Get a recommendation rule for an app.
+        /// Description for Get a recommendation rule for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2794,7 +2786,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2807,7 +2802,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("updateSeen", updateSeen);
                 tracingParameters.Add("recommendationId", recommendationId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetRuleDetailsByWebApp", tracingParameters);
             }
@@ -2827,9 +2821,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("recommendationId={0}", System.Uri.EscapeDataString(recommendationId)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2955,7 +2949,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Disables the specific rule for a web site permanently.
         /// </summary>
         /// <remarks>
-        /// Disables the specific rule for a web site permanently.
+        /// Description for Disables the specific rule for a web site permanently.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2972,7 +2966,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -3017,7 +3011,10 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3028,7 +3025,6 @@ internal RecommendationsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("siteName", siteName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DisableRecommendationForSite", tracingParameters);
             }
@@ -3040,9 +3036,9 @@ internal RecommendationsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3104,14 +3100,13 @@ internal RecommendationsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -3121,10 +3116,6 @@ internal RecommendationsOperations(WebSiteManagementClient 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);
@@ -3155,7 +3146,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// List all recommendations for a subscription.
         /// </summary>
         /// <remarks>
-        /// List all recommendations for a subscription.
+        /// Description for List all recommendations for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3327,8 +3318,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the time
-        /// range.
+        /// Description for Get past recommendations for an app, optionally specified
+        /// by the time range.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3499,7 +3490,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3671,8 +3662,8 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// range.
         /// </summary>
         /// <remarks>
-        /// Get past recommendations for an app, optionally specified by the time
-        /// range.
+        /// Description for Get past recommendations for an app, optionally specified
+        /// by the time range.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3843,7 +3834,7 @@ internal RecommendationsOperations(WebSiteManagementClient client)
         /// Get all recommendations for an app.
         /// </summary>
         /// <remarks>
-        /// Get all recommendations for an app.
+        /// Description for Get all recommendations for an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs
index 9927ccbbb501..cfcc8df0d39f 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/RecommendationsOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class RecommendationsOperationsExtensions
             /// List all recommendations for a subscription.
             /// </summary>
             /// <remarks>
-            /// List all recommendations for a subscription.
+            /// Description for List all recommendations for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -50,7 +50,7 @@ public static partial class RecommendationsOperationsExtensions
             /// List all recommendations for a subscription.
             /// </summary>
             /// <remarks>
-            /// List all recommendations for a subscription.
+            /// Description for List all recommendations for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -81,7 +81,8 @@ public static partial class RecommendationsOperationsExtensions
             /// Reset all recommendation opt-out settings for a subscription.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for a subscription.
+            /// Description for Reset all recommendation opt-out settings for a
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -95,7 +96,8 @@ public static void ResetAllFilters(this IRecommendationsOperations operations)
             /// Reset all recommendation opt-out settings for a subscription.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for a subscription.
+            /// Description for Reset all recommendation opt-out settings for a
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -113,8 +115,8 @@ public static void ResetAllFilters(this IRecommendationsOperations operations)
             /// future.
             /// </summary>
             /// <remarks>
-            /// Disables the specified rule so it will not apply to a subscription in the
-            /// future.
+            /// Description for Disables the specified rule so it will not apply to a
+            /// subscription in the future.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -132,8 +134,8 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// future.
             /// </summary>
             /// <remarks>
-            /// Disables the specified rule so it will not apply to a subscription in the
-            /// future.
+            /// Description for Disables the specified rule so it will not apply to a
+            /// subscription in the future.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -154,8 +156,8 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -187,8 +189,8 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -225,7 +227,7 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -255,7 +257,7 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -291,7 +293,7 @@ public static void DisableRecommendationForSubscription(this IRecommendationsOpe
             /// Disable all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Disable all recommendations for an app.
+            /// Description for Disable all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -313,7 +315,7 @@ public static void DisableAllForHostingEnvironment(this IRecommendationsOperatio
             /// Disable all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Disable all recommendations for an app.
+            /// Description for Disable all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -338,7 +340,7 @@ public static void DisableAllForHostingEnvironment(this IRecommendationsOperatio
             /// Reset all recommendation opt-out settings for an app.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for an app.
+            /// Description for Reset all recommendation opt-out settings for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -360,7 +362,7 @@ public static void ResetAllFiltersForHostingEnvironment(this IRecommendationsOpe
             /// Reset all recommendation opt-out settings for an app.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for an app.
+            /// Description for Reset all recommendation opt-out settings for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -385,7 +387,7 @@ public static void ResetAllFiltersForHostingEnvironment(this IRecommendationsOpe
             /// Get a recommendation rule for an app.
             /// </summary>
             /// <remarks>
-            /// Get a recommendation rule for an app.
+            /// Description for Get a recommendation rule for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -416,7 +418,7 @@ public static void ResetAllFiltersForHostingEnvironment(this IRecommendationsOpe
             /// Get a recommendation rule for an app.
             /// </summary>
             /// <remarks>
-            /// Get a recommendation rule for an app.
+            /// Description for Get a recommendation rule for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -453,7 +455,7 @@ public static void ResetAllFiltersForHostingEnvironment(this IRecommendationsOpe
             /// Disables the specific rule for a web site permanently.
             /// </summary>
             /// <remarks>
-            /// Disables the specific rule for a web site permanently.
+            /// Description for Disables the specific rule for a web site permanently.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -478,7 +480,7 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// Disables the specific rule for a web site permanently.
             /// </summary>
             /// <remarks>
-            /// Disables the specific rule for a web site permanently.
+            /// Description for Disables the specific rule for a web site permanently.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -507,8 +509,8 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -540,8 +542,8 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -578,7 +580,7 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -608,7 +610,7 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -644,7 +646,7 @@ public static void DisableRecommendationForHostingEnvironment(this IRecommendati
             /// Disable all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Disable all recommendations for an app.
+            /// Description for Disable all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -664,7 +666,7 @@ public static void DisableAllForWebApp(this IRecommendationsOperations operation
             /// Disable all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Disable all recommendations for an app.
+            /// Description for Disable all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -687,7 +689,7 @@ public static void DisableAllForWebApp(this IRecommendationsOperations operation
             /// Reset all recommendation opt-out settings for an app.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for an app.
+            /// Description for Reset all recommendation opt-out settings for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -707,7 +709,7 @@ public static void ResetAllFiltersForWebApp(this IRecommendationsOperations oper
             /// Reset all recommendation opt-out settings for an app.
             /// </summary>
             /// <remarks>
-            /// Reset all recommendation opt-out settings for an app.
+            /// Description for Reset all recommendation opt-out settings for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -730,7 +732,7 @@ public static void ResetAllFiltersForWebApp(this IRecommendationsOperations oper
             /// Get a recommendation rule for an app.
             /// </summary>
             /// <remarks>
-            /// Get a recommendation rule for an app.
+            /// Description for Get a recommendation rule for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -761,7 +763,7 @@ public static void ResetAllFiltersForWebApp(this IRecommendationsOperations oper
             /// Get a recommendation rule for an app.
             /// </summary>
             /// <remarks>
-            /// Get a recommendation rule for an app.
+            /// Description for Get a recommendation rule for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -798,7 +800,7 @@ public static void ResetAllFiltersForWebApp(this IRecommendationsOperations oper
             /// Disables the specific rule for a web site permanently.
             /// </summary>
             /// <remarks>
-            /// Disables the specific rule for a web site permanently.
+            /// Description for Disables the specific rule for a web site permanently.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -821,7 +823,7 @@ public static void DisableRecommendationForSite(this IRecommendationsOperations
             /// Disables the specific rule for a web site permanently.
             /// </summary>
             /// <remarks>
-            /// Disables the specific rule for a web site permanently.
+            /// Description for Disables the specific rule for a web site permanently.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -847,7 +849,7 @@ public static void DisableRecommendationForSite(this IRecommendationsOperations
             /// List all recommendations for a subscription.
             /// </summary>
             /// <remarks>
-            /// List all recommendations for a subscription.
+            /// Description for List all recommendations for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -864,7 +866,7 @@ public static IPage<Recommendation> ListNext(this IRecommendationsOperations ope
             /// List all recommendations for a subscription.
             /// </summary>
             /// <remarks>
-            /// List all recommendations for a subscription.
+            /// Description for List all recommendations for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -888,8 +890,8 @@ public static IPage<Recommendation> ListNext(this IRecommendationsOperations ope
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -907,8 +909,8 @@ public static IPage<Recommendation> ListHistoryForHostingEnvironmentNext(this IR
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -931,7 +933,7 @@ public static IPage<Recommendation> ListHistoryForHostingEnvironmentNext(this IR
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -948,7 +950,7 @@ public static IPage<Recommendation> ListRecommendedRulesForHostingEnvironmentNex
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -972,8 +974,8 @@ public static IPage<Recommendation> ListRecommendedRulesForHostingEnvironmentNex
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -991,8 +993,8 @@ public static IPage<Recommendation> ListHistoryForWebAppNext(this IRecommendatio
             /// range.
             /// </summary>
             /// <remarks>
-            /// Get past recommendations for an app, optionally specified by the time
-            /// range.
+            /// Description for Get past recommendations for an app, optionally specified
+            /// by the time range.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1015,7 +1017,7 @@ public static IPage<Recommendation> ListHistoryForWebAppNext(this IRecommendatio
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1032,7 +1034,7 @@ public static IPage<Recommendation> ListRecommendedRulesForWebAppNext(this IReco
             /// Get all recommendations for an app.
             /// </summary>
             /// <remarks>
-            /// Get all recommendations for an app.
+            /// Description for Get all recommendations for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperations.cs
index b0e638e62de0..02e189302750 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperations.cs
@@ -54,7 +54,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// List all ResourceHealthMetadata for all sites in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in the
+        /// subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +84,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +95,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +103,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/resourceHealthMetadata").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -229,8 +232,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the resource group in the
-        /// subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in the
+        /// resource group in the subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -281,7 +284,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -290,7 +296,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -300,9 +305,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -429,8 +434,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site as a
-        /// collection
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site as a collection
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -488,7 +493,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -498,7 +506,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBySite", tracingParameters);
             }
@@ -509,9 +516,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -637,7 +644,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// Gets the category of ResourceHealthMetadata to use for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -695,7 +703,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -705,7 +716,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBySite", tracingParameters);
             }
@@ -716,9 +726,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -845,8 +855,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site as a
-        /// collection
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site as a collection
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -912,7 +922,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -923,7 +936,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBySiteSlot", tracingParameters);
             }
@@ -935,9 +947,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1063,7 +1075,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// Gets the category of ResourceHealthMetadata to use for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1129,7 +1142,10 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1140,7 +1156,6 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBySiteSlot", tracingParameters);
             }
@@ -1152,9 +1167,9 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1280,7 +1295,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// List all ResourceHealthMetadata for all sites in the subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in the
+        /// subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1452,8 +1468,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// subscription.
         /// </summary>
         /// <remarks>
-        /// List all ResourceHealthMetadata for all sites in the resource group in the
-        /// subscription.
+        /// Description for List all ResourceHealthMetadata for all sites in the
+        /// resource group in the subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1625,8 +1641,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site as a
-        /// collection
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site as a collection
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1798,8 +1814,8 @@ internal ResourceHealthMetadataOperations(WebSiteManagementClient client)
         /// collection
         /// </summary>
         /// <remarks>
-        /// Gets the category of ResourceHealthMetadata to use for the given site as a
-        /// collection
+        /// Description for Gets the category of ResourceHealthMetadata to use for the
+        /// given site as a collection
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperationsExtensions.cs
index b6c10f559545..a9287925e196 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/ResourceHealthMetadataOperationsExtensions.cs
@@ -25,7 +25,8 @@ public static partial class ResourceHealthMetadataOperationsExtensions
             /// List all ResourceHealthMetadata for all sites in the subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,7 +40,8 @@ public static IPage<ResourceHealthMetadata> List(this IResourceHealthMetadataOpe
             /// List all ResourceHealthMetadata for all sites in the subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -60,8 +62,8 @@ public static IPage<ResourceHealthMetadata> List(this IResourceHealthMetadataOpe
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the resource group in the
-            /// subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// resource group in the subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -79,8 +81,8 @@ public static IPage<ResourceHealthMetadata> ListByResourceGroup(this IResourceHe
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the resource group in the
-            /// subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// resource group in the subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -104,8 +106,8 @@ public static IPage<ResourceHealthMetadata> ListByResourceGroup(this IResourceHe
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -126,8 +128,8 @@ public static IPage<ResourceHealthMetadata> ListBySite(this IResourceHealthMetad
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -153,7 +155,8 @@ public static IPage<ResourceHealthMetadata> ListBySite(this IResourceHealthMetad
             /// Gets the category of ResourceHealthMetadata to use for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -173,7 +176,8 @@ public static ResourceHealthMetadata GetBySite(this IResourceHealthMetadataOpera
             /// Gets the category of ResourceHealthMetadata to use for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -200,8 +204,8 @@ public static ResourceHealthMetadata GetBySite(this IResourceHealthMetadataOpera
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -226,8 +230,8 @@ public static IPage<ResourceHealthMetadata> ListBySiteSlot(this IResourceHealthM
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -257,7 +261,8 @@ public static IPage<ResourceHealthMetadata> ListBySiteSlot(this IResourceHealthM
             /// Gets the category of ResourceHealthMetadata to use for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -281,7 +286,8 @@ public static ResourceHealthMetadata GetBySiteSlot(this IResourceHealthMetadataO
             /// Gets the category of ResourceHealthMetadata to use for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -311,7 +317,8 @@ public static ResourceHealthMetadata GetBySiteSlot(this IResourceHealthMetadataO
             /// List all ResourceHealthMetadata for all sites in the subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -328,7 +335,8 @@ public static IPage<ResourceHealthMetadata> ListNext(this IResourceHealthMetadat
             /// List all ResourceHealthMetadata for all sites in the subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -352,8 +360,8 @@ public static IPage<ResourceHealthMetadata> ListNext(this IResourceHealthMetadat
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the resource group in the
-            /// subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// resource group in the subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -371,8 +379,8 @@ public static IPage<ResourceHealthMetadata> ListByResourceGroupNext(this IResour
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// List all ResourceHealthMetadata for all sites in the resource group in the
-            /// subscription.
+            /// Description for List all ResourceHealthMetadata for all sites in the
+            /// resource group in the subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -396,8 +404,8 @@ public static IPage<ResourceHealthMetadata> ListByResourceGroupNext(this IResour
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -415,8 +423,8 @@ public static IPage<ResourceHealthMetadata> ListBySiteNext(this IResourceHealthM
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -440,8 +448,8 @@ public static IPage<ResourceHealthMetadata> ListBySiteNext(this IResourceHealthM
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -459,8 +467,8 @@ public static IPage<ResourceHealthMetadata> ListBySiteSlotNext(this IResourceHea
             /// collection
             /// </summary>
             /// <remarks>
-            /// Gets the category of ResourceHealthMetadata to use for the given site as a
-            /// collection
+            /// Description for Gets the category of ResourceHealthMetadata to use for the
+            /// given site as a collection
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs
index 288a1a72d490..a63d0f189431 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/SdkInfo_WebSiteManagementClient.cs
@@ -19,37 +19,36 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_WebSiteManageme
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("CertificateRegistration", "AppServiceCertificateOrders", "2018-02-01"),
-                new Tuple<string, string, string>("CertificateRegistration", "CertificateRegistrationProvider", "2018-02-01"),
-                new Tuple<string, string, string>("DomainRegistration", "DomainRegistrationProvider", "2018-02-01"),
-                new Tuple<string, string, string>("DomainRegistration", "Domains", "2018-02-01"),
-                new Tuple<string, string, string>("DomainRegistration", "TopLevelDomains", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "AppServiceEnvironments", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "AppServicePlans", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "Certificates", "2018-11-01"),
-                new Tuple<string, string, string>("Web", "CheckNameAvailability", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "DeletedWebApps", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "Diagnostics", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "GetPublishingUser", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "GetSourceControl", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "GetSubscriptionDeploymentLocations", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListBillingMeters", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListGeoRegions", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListPremierAddOnOffers", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListSiteIdentifiersAssignedToHostName", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListSkus", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ListSourceControls", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "Provider", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "Recommendations", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ResourceHealthMetadata", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "UpdatePublishingUser", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "UpdateSourceControl", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "Validate", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "ValidateContainerSettings", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "VerifyHostingEnvironmentVnet", "2018-02-01"),
-                new Tuple<string, string, string>("Web", "WebApps", "2018-11-01"),
-                new Tuple<string, string, string>("WebSiteManagementClient", "Move", "2018-02-01"),
-                new Tuple<string, string, string>("WebSiteManagementClient", "ValidateMove", "2018-02-01"),
+                new Tuple<string, string, string>("CertificateRegistration", "AppServiceCertificateOrders", "2019-08-01"),
+                new Tuple<string, string, string>("CertificateRegistration", "CertificateRegistrationProvider", "2019-08-01"),
+                new Tuple<string, string, string>("DomainRegistration", "DomainRegistrationProvider", "2019-08-01"),
+                new Tuple<string, string, string>("DomainRegistration", "Domains", "2019-08-01"),
+                new Tuple<string, string, string>("DomainRegistration", "TopLevelDomains", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "AppServiceEnvironments", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "AppServicePlans", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "Certificates", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "CheckNameAvailability", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "DeletedWebApps", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "Diagnostics", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "GetPublishingUser", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "GetSourceControl", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "GetSubscriptionDeploymentLocations", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListBillingMeters", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListGeoRegions", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListPremierAddOnOffers", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListSiteIdentifiersAssignedToHostName", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListSkus", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ListSourceControls", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "Provider", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "Recommendations", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "ResourceHealthMetadata", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "UpdatePublishingUser", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "UpdateSourceControl", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "Validate", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "VerifyHostingEnvironmentVnet", "2019-08-01"),
+                new Tuple<string, string, string>("Web", "WebApps", "2019-08-01"),
+                new Tuple<string, string, string>("WebSiteManagementClient", "Move", "2019-08-01"),
+                new Tuple<string, string, string>("WebSiteManagementClient", "ValidateMove", "2019-08-01"),
               }.AsEnumerable();
           }
       }
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperations.cs
index d948ba5a2fd8..99763205c439 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperations.cs
@@ -54,7 +54,7 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
         /// Get all top-level domains supported for registration.
         /// </summary>
         /// <remarks>
-        /// Get all top-level domains supported for registration.
+        /// Description for Get all top-level domains supported for registration.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +83,10 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -91,7 +94,6 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -100,9 +102,9 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.DomainRegistration/topLevelDomains").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -228,7 +230,7 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
         /// Get details of a top-level domain.
         /// </summary>
         /// <remarks>
-        /// Get details of a top-level domain.
+        /// Description for Get details of a top-level domain.
         /// </remarks>
         /// <param name='name'>
         /// Name of the top-level domain.
@@ -264,7 +266,10 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -273,7 +278,6 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -283,9 +287,9 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -412,8 +416,8 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
         /// domain.
         /// </summary>
         /// <remarks>
-        /// Gets all legal agreements that user needs to accept before purchasing a
-        /// domain.
+        /// Description for Gets all legal agreements that user needs to accept before
+        /// purchasing a domain.
         /// </remarks>
         /// <param name='name'>
         /// Name of the top-level domain.
@@ -456,7 +460,10 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -466,7 +473,6 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("agreementOption", agreementOption);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListAgreements", tracingParameters);
             }
@@ -476,9 +482,9 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -610,7 +616,7 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
         /// Get all top-level domains supported for registration.
         /// </summary>
         /// <remarks>
-        /// Get all top-level domains supported for registration.
+        /// Description for Get all top-level domains supported for registration.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -782,8 +788,8 @@ internal TopLevelDomainsOperations(WebSiteManagementClient client)
         /// domain.
         /// </summary>
         /// <remarks>
-        /// Gets all legal agreements that user needs to accept before purchasing a
-        /// domain.
+        /// Description for Gets all legal agreements that user needs to accept before
+        /// purchasing a domain.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperationsExtensions.cs
index bf10b25b490f..473cf51c4da6 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/TopLevelDomainsOperationsExtensions.cs
@@ -25,7 +25,7 @@ public static partial class TopLevelDomainsOperationsExtensions
             /// Get all top-level domains supported for registration.
             /// </summary>
             /// <remarks>
-            /// Get all top-level domains supported for registration.
+            /// Description for Get all top-level domains supported for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,7 +39,7 @@ public static IPage<TopLevelDomain> List(this ITopLevelDomainsOperations operati
             /// Get all top-level domains supported for registration.
             /// </summary>
             /// <remarks>
-            /// Get all top-level domains supported for registration.
+            /// Description for Get all top-level domains supported for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -59,7 +59,7 @@ public static IPage<TopLevelDomain> List(this ITopLevelDomainsOperations operati
             /// Get details of a top-level domain.
             /// </summary>
             /// <remarks>
-            /// Get details of a top-level domain.
+            /// Description for Get details of a top-level domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -76,7 +76,7 @@ public static TopLevelDomain Get(this ITopLevelDomainsOperations operations, str
             /// Get details of a top-level domain.
             /// </summary>
             /// <remarks>
-            /// Get details of a top-level domain.
+            /// Description for Get details of a top-level domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -100,8 +100,8 @@ public static TopLevelDomain Get(this ITopLevelDomainsOperations operations, str
             /// domain.
             /// </summary>
             /// <remarks>
-            /// Gets all legal agreements that user needs to accept before purchasing a
-            /// domain.
+            /// Description for Gets all legal agreements that user needs to accept before
+            /// purchasing a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -122,8 +122,8 @@ public static IPage<TldLegalAgreement> ListAgreements(this ITopLevelDomainsOpera
             /// domain.
             /// </summary>
             /// <remarks>
-            /// Gets all legal agreements that user needs to accept before purchasing a
-            /// domain.
+            /// Description for Gets all legal agreements that user needs to accept before
+            /// purchasing a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -149,7 +149,7 @@ public static IPage<TldLegalAgreement> ListAgreements(this ITopLevelDomainsOpera
             /// Get all top-level domains supported for registration.
             /// </summary>
             /// <remarks>
-            /// Get all top-level domains supported for registration.
+            /// Description for Get all top-level domains supported for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -166,7 +166,7 @@ public static IPage<TopLevelDomain> ListNext(this ITopLevelDomainsOperations ope
             /// Get all top-level domains supported for registration.
             /// </summary>
             /// <remarks>
-            /// Get all top-level domains supported for registration.
+            /// Description for Get all top-level domains supported for registration.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -190,8 +190,8 @@ public static IPage<TopLevelDomain> ListNext(this ITopLevelDomainsOperations ope
             /// domain.
             /// </summary>
             /// <remarks>
-            /// Gets all legal agreements that user needs to accept before purchasing a
-            /// domain.
+            /// Description for Gets all legal agreements that user needs to accept before
+            /// purchasing a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -209,8 +209,8 @@ public static IPage<TldLegalAgreement> ListAgreementsNext(this ITopLevelDomainsO
             /// domain.
             /// </summary>
             /// <remarks>
-            /// Gets all legal agreements that user needs to accept before purchasing a
-            /// domain.
+            /// Description for Gets all legal agreements that user needs to accept before
+            /// purchasing a domain.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs
index 2ee5c4e65942..08b16c716472 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperations.cs
@@ -55,7 +55,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get all apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Get all apps for a subscription.
+        /// Description for Get all apps for a subscription.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -84,7 +84,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -92,7 +95,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
             }
@@ -101,9 +103,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/sites").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -229,7 +231,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets all web, mobile, and API apps in the specified resource group.
         /// </summary>
         /// <remarks>
-        /// Gets all web, mobile, and API apps in the specified resource group.
+        /// Description for Gets all web, mobile, and API apps in the specified
+        /// resource group.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -285,7 +288,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -295,7 +301,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("includeSlots", includeSlots);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroup", tracingParameters);
             }
@@ -309,9 +314,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("includeSlots={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(includeSlots, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -437,7 +442,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the details of a web, mobile, or API app.
         /// </summary>
         /// <remarks>
-        /// Gets the details of a web, mobile, or API app.
+        /// Description for Gets the details of a web, mobile, or API app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -451,7 +456,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -495,7 +500,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -505,7 +513,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
@@ -516,9 +523,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -580,14 +587,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -597,10 +603,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -650,8 +652,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -680,7 +682,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a web, mobile, or API app, or one of the deployment slots.
         /// </summary>
         /// <remarks>
-        /// Deletes a web, mobile, or API app, or one of the deployment slots.
+        /// Description for Deletes a web, mobile, or API app, or one of the deployment
+        /// slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -702,7 +705,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -743,7 +746,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -755,7 +761,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("deleteMetrics", deleteMetrics);
                 tracingParameters.Add("deleteEmptyServerFarm", deleteEmptyServerFarm);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Delete", tracingParameters);
             }
@@ -774,9 +779,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("deleteEmptyServerFarm={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(deleteEmptyServerFarm, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -838,14 +843,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -855,10 +859,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -890,8 +890,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -957,7 +957,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -968,7 +971,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteEnvelope", siteEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
@@ -979,9 +981,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1131,7 +1133,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Analyze a custom hostname.
         /// </summary>
         /// <remarks>
-        /// Analyze a custom hostname.
+        /// Description for Analyze a custom hostname.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1192,7 +1194,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1203,7 +1208,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "AnalyzeCustomHostname", tracingParameters);
             }
@@ -1218,9 +1222,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("hostName={0}", System.Uri.EscapeDataString(hostName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1347,8 +1351,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Applies the configuration settings from the target slot onto the current
-        /// slot.
+        /// Description for Applies the configuration settings from the target slot
+        /// onto the current slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1365,7 +1369,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -1414,7 +1418,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1425,7 +1432,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slotSwapEntity", slotSwapEntity);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ApplySlotConfigToProduction", tracingParameters);
             }
@@ -1436,9 +1442,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1506,14 +1512,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -1523,10 +1528,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -1557,7 +1558,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a backup of an app.
         /// </summary>
         /// <remarks>
-        /// Creates a backup of an app.
+        /// Description for Creates a backup of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1627,7 +1628,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1638,7 +1642,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Backup", tracingParameters);
             }
@@ -1649,9 +1652,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1783,7 +1786,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -1841,7 +1844,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1851,7 +1857,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBackups", tracingParameters);
             }
@@ -1862,9 +1867,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1990,7 +1995,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Gets a backup of an app by its ID.
+        /// Description for Gets a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2055,7 +2060,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2066,7 +2074,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBackupStatus", tracingParameters);
             }
@@ -2078,9 +2085,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{backupId}", System.Uri.EscapeDataString(backupId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2206,7 +2213,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Deletes a backup of an app by its ID.
+        /// Description for Deletes a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2223,7 +2230,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2268,7 +2275,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2279,7 +2289,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteBackup", tracingParameters);
             }
@@ -2291,9 +2300,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{backupId}", System.Uri.EscapeDataString(backupId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2355,14 +2364,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2372,10 +2380,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -2409,10 +2413,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// request body.
         /// </summary>
         /// <remarks>
-        /// Gets status of a web app backup that may be in progress, including secrets
-        /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-        /// used to update the SAS URL for the backup if a new URL is passed in the
-        /// request body.
+        /// Description for Gets status of a web app backup that may be in progress,
+        /// including secrets associated with the backup, such as the Azure Storage SAS
+        /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+        /// passed in the request body.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2488,7 +2492,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2500,7 +2507,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBackupStatusSecrets", tracingParameters);
             }
@@ -2512,9 +2518,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{backupId}", System.Uri.EscapeDataString(backupId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2647,8 +2653,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2679,7 +2685,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2737,7 +2743,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2747,7 +2756,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListConfigurations", tracingParameters);
             }
@@ -2758,9 +2766,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2886,7 +2894,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Replaces the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the application settings of an app.
+        /// Description for Replaces the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2951,7 +2959,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2962,7 +2973,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("appSettings", appSettings);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateApplicationSettings", tracingParameters);
             }
@@ -2973,9 +2983,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3107,7 +3117,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the application settings of an app.
+        /// Description for Gets the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3165,7 +3175,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3175,7 +3188,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListApplicationSettings", tracingParameters);
             }
@@ -3186,9 +3198,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3315,8 +3327,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// app.
         /// </summary>
         /// <remarks>
-        /// Updates the Authentication / Authorization settings associated with web
-        /// app.
+        /// Description for Updates the Authentication / Authorization settings
+        /// associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3381,7 +3393,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3392,7 +3407,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteAuthSettings", siteAuthSettings);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateAuthSettings", tracingParameters);
             }
@@ -3403,9 +3417,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3537,7 +3551,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Authentication/Authorization settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Authentication/Authorization settings of an app.
+        /// Description for Gets the Authentication/Authorization settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3595,7 +3609,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3605,7 +3622,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetAuthSettings", tracingParameters);
             }
@@ -3616,9 +3632,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3744,7 +3760,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the Azure storage account configurations of an app.
+        /// Description for Updates the Azure storage account configurations of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3809,7 +3825,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3820,7 +3839,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("azureStorageAccounts", azureStorageAccounts);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateAzureStorageAccounts", tracingParameters);
             }
@@ -3831,9 +3849,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3965,7 +3983,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Azure storage account configurations of an app.
+        /// Description for Gets the Azure storage account configurations of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4023,7 +4041,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4033,7 +4054,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListAzureStorageAccounts", tracingParameters);
             }
@@ -4044,9 +4064,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4172,7 +4192,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the backup configuration of an app.
+        /// Description for Updates the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4241,7 +4261,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4252,7 +4275,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateBackupConfiguration", tracingParameters);
             }
@@ -4263,9 +4285,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4397,7 +4419,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the backup configuration of an app.
+        /// Description for Deletes the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4411,7 +4433,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -4452,7 +4474,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4462,7 +4487,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteBackupConfiguration", tracingParameters);
             }
@@ -4473,9 +4497,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4537,14 +4561,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -4554,10 +4577,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -4588,7 +4607,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the backup configuration of an app.
+        /// Description for Gets the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4646,7 +4665,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4656,7 +4678,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBackupConfiguration", tracingParameters);
             }
@@ -4667,9 +4688,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4792,10 +4813,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Replaces the connection strings of an app.
+        /// Gets the config reference app settings and status of an app
         /// </summary>
         /// <remarks>
-        /// Replaces the connection strings of an app.
+        /// Description for Gets the config reference app settings and status of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -4803,9 +4824,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='connectionStrings'>
-        /// Connection strings of the app or deployment slot. See example.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -4827,7 +4845,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ConnectionStringDictionary>> UpdateConnectionStringsWithHttpMessagesAsync(string resourceGroupName, string name, ConnectionStringDictionary connectionStrings, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<KeyVaultReferenceCollection>> GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -4852,15 +4870,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (connectionStrings == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionStrings");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -4870,21 +4887,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("connectionStrings", connectionStrings);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateConnectionStrings", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetAppSettingsKeyVaultReferences", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -4893,7 +4908,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -4924,12 +4939,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionStrings != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionStrings, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -4980,7 +4989,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ConnectionStringDictionary>();
+            var _result = new AzureOperationResponse<KeyVaultReferenceCollection>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -4993,7 +5002,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConnectionStringDictionary>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<KeyVaultReferenceCollection>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5013,10 +5022,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the connection strings of an app.
+        /// Gets the config reference and status of an app
         /// </summary>
         /// <remarks>
-        /// Gets the connection strings of an app.
+        /// Description for Gets the config reference and status of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5024,6 +5033,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='appSettingKey'>
+        /// App Setting key name.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5045,7 +5057,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ConnectionStringDictionary>> ListConnectionStringsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<KeyVaultReferenceResource>> GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(string resourceGroupName, string name, string appSettingKey, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5070,11 +5082,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (appSettingKey == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "appSettingKey");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5084,20 +5103,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("appSettingKey", appSettingKey);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConnectionStrings", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetAppSettingKeyVaultReference", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings/list").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/configreferences/appsettings/{appSettingKey}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{appSettingKey}", System.Uri.EscapeDataString(appSettingKey));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5106,7 +5126,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5187,7 +5207,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ConnectionStringDictionary>();
+            var _result = new AzureOperationResponse<KeyVaultReferenceResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5200,7 +5220,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConnectionStringDictionary>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<KeyVaultReferenceResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5220,10 +5240,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the logging configuration of an app.
+        /// Replaces the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the logging configuration of an app.
+        /// Description for Replaces the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5231,6 +5251,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='connectionStrings'>
+        /// Connection strings of the app or deployment slot. See example.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5252,7 +5275,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteLogsConfig>> GetDiagnosticLogsConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ConnectionStringDictionary>> UpdateConnectionStringsWithHttpMessagesAsync(string resourceGroupName, string name, ConnectionStringDictionary connectionStrings, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5277,11 +5300,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (connectionStrings == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionStrings");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5291,20 +5321,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("connectionStrings", connectionStrings);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetDiagnosticLogsConfiguration", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateConnectionStrings", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/logs").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5313,7 +5343,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5344,6 +5374,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionStrings != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionStrings, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -5394,7 +5430,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteLogsConfig>();
+            var _result = new AzureOperationResponse<ConnectionStringDictionary>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5407,7 +5443,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteLogsConfig>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConnectionStringDictionary>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5427,10 +5463,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Updates the logging configuration of an app.
+        /// Gets the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the logging configuration of an app.
+        /// Description for Gets the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5438,10 +5474,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='siteLogsConfig'>
-        /// A SiteLogsConfig JSON object that contains the logging configuration to
-        /// change in the "properties" property.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5463,7 +5495,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteLogsConfig>> UpdateDiagnosticLogsConfigWithHttpMessagesAsync(string resourceGroupName, string name, SiteLogsConfig siteLogsConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ConnectionStringDictionary>> ListConnectionStringsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5488,19 +5520,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (siteLogsConfig == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "siteLogsConfig");
-            }
-            if (siteLogsConfig != null)
-            {
-                siteLogsConfig.Validate();
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5510,21 +5537,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("siteLogsConfig", siteLogsConfig);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateDiagnosticLogsConfig", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConnectionStrings", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/logs").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/connectionstrings/list").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5533,7 +5558,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5564,12 +5589,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(siteLogsConfig != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteLogsConfig, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -5620,7 +5639,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteLogsConfig>();
+            var _result = new AzureOperationResponse<ConnectionStringDictionary>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5633,7 +5652,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteLogsConfig>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ConnectionStringDictionary>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5653,10 +5672,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Replaces the metadata of an app.
+        /// Gets the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the metadata of an app.
+        /// Description for Gets the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5664,9 +5683,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='metadata'>
-        /// Edited metadata of the app or deployment slot. See example.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5688,7 +5704,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<StringDictionary>> UpdateMetadataWithHttpMessagesAsync(string resourceGroupName, string name, StringDictionary metadata, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteLogsConfig>> GetDiagnosticLogsConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5713,15 +5729,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (metadata == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "metadata");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5731,21 +5746,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("metadata", metadata);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateMetadata", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetDiagnosticLogsConfiguration", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/logs").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5754,7 +5767,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5785,12 +5798,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(metadata != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(metadata, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -5841,7 +5848,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<StringDictionary>();
+            var _result = new AzureOperationResponse<SiteLogsConfig>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -5854,7 +5861,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<StringDictionary>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteLogsConfig>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -5874,10 +5881,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the metadata of an app.
+        /// Updates the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the metadata of an app.
+        /// Description for Updates the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -5885,6 +5892,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='siteLogsConfig'>
+        /// A SiteLogsConfig JSON object that contains the logging configuration to
+        /// change in the "properties" property.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -5906,7 +5917,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<StringDictionary>> ListMetadataWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteLogsConfig>> UpdateDiagnosticLogsConfigWithHttpMessagesAsync(string resourceGroupName, string name, SiteLogsConfig siteLogsConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -5931,11 +5942,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (siteLogsConfig == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "siteLogsConfig");
+            }
+            if (siteLogsConfig != null)
+            {
+                siteLogsConfig.Validate();
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -5945,20 +5967,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("siteLogsConfig", siteLogsConfig);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetadata", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateDiagnosticLogsConfig", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata/list").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/logs").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -5967,7 +5989,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -5998,6 +6020,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(siteLogsConfig != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteLogsConfig, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6048,7 +6076,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<StringDictionary>();
+            var _result = new AzureOperationResponse<SiteLogsConfig>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6061,7 +6089,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<StringDictionary>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteLogsConfig>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6081,10 +6109,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Replaces the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Replaces the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6092,33 +6120,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<User>> ListPublishingCredentialsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<User> _response = await BeginListPublishingCredentialsWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Updates the Push settings associated with web app.
-        /// </summary>
-        /// <remarks>
-        /// Updates the Push settings associated with web app.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='pushSettings'>
-        /// Push settings associated with web app.
+        /// <param name='metadata'>
+        /// Edited metadata of the app or deployment slot. See example.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6141,7 +6144,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<PushSettings>> UpdateSitePushSettingsWithHttpMessagesAsync(string resourceGroupName, string name, PushSettings pushSettings, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<StringDictionary>> UpdateMetadataWithHttpMessagesAsync(string resourceGroupName, string name, StringDictionary metadata, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6166,19 +6169,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (pushSettings == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "pushSettings");
-            }
-            if (pushSettings != null)
+            if (metadata == null)
             {
-                pushSettings.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "metadata");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6188,21 +6190,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("pushSettings", pushSettings);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("metadata", metadata);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateSitePushSettings", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateMetadata", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/pushsettings").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6242,9 +6243,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(pushSettings != null)
+            if(metadata != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(pushSettings, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(metadata, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -6298,7 +6299,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<PushSettings>();
+            var _result = new AzureOperationResponse<StringDictionary>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6311,7 +6312,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<PushSettings>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<StringDictionary>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6331,16 +6332,16 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the Push settings associated with web app.
+        /// Gets the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Push settings associated with web app.
+        /// Description for Gets the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
+        /// Name of the app.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6363,7 +6364,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<PushSettings>> ListSitePushSettingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<StringDictionary>> ListMetadataWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6392,7 +6393,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6402,20 +6406,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSitePushSettings", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListMetadata", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/pushsettings/list").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/metadata/list").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6505,7 +6508,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<PushSettings>();
+            var _result = new AzureOperationResponse<StringDictionary>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6518,7 +6521,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<PushSettings>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<StringDictionary>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6538,12 +6541,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the names of app settings and connection strings that stick to the
-        /// slot (not swapped).
+        /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the names of app settings and connection strings that stick to the
-        /// slot (not swapped).
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -6552,6 +6553,34 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of the app.
         /// </param>
         /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<User>> ListPublishingCredentialsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<User> _response = await BeginListPublishingCredentialsWithHttpMessagesAsync(resourceGroupName, name, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Updates the Push settings associated with web app.
+        /// </summary>
+        /// <remarks>
+        /// Description for Updates the Push settings associated with web app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
+        /// </param>
+        /// <param name='pushSettings'>
+        /// Push settings associated with web app.
+        /// </param>
+        /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
@@ -6572,7 +6601,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SlotConfigNamesResource>> ListSlotConfigurationNamesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<PushSettings>> UpdateSitePushSettingsWithHttpMessagesAsync(string resourceGroupName, string name, PushSettings pushSettings, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6597,11 +6626,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (pushSettings == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "pushSettings");
+            }
+            if (pushSettings != null)
+            {
+                pushSettings.Validate();
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6611,20 +6651,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("pushSettings", pushSettings);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSlotConfigurationNames", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateSitePushSettings", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/pushsettings").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6633,7 +6673,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6664,6 +6704,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(pushSettings != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(pushSettings, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6714,7 +6760,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SlotConfigNamesResource>();
+            var _result = new AzureOperationResponse<PushSettings>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6727,7 +6773,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SlotConfigNamesResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<PushSettings>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6747,21 +6793,16 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Updates the names of application settings and connection string that remain
-        /// with the slot during swap operation.
+        /// Gets the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Updates the names of application settings and connection string that remain
-        /// with the slot during swap operation.
+        /// Description for Gets the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='slotConfigNames'>
-        /// Names of application settings and connection strings. See example.
+        /// Name of web app.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -6784,7 +6825,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SlotConfigNamesResource>> UpdateSlotConfigurationNamesWithHttpMessagesAsync(string resourceGroupName, string name, SlotConfigNamesResource slotConfigNames, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<PushSettings>> ListSitePushSettingsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -6809,15 +6850,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (slotConfigNames == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slotConfigNames");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -6827,21 +6867,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("slotConfigNames", slotConfigNames);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateSlotConfigurationNames", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSitePushSettings", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/pushsettings/list").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -6850,7 +6888,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -6881,12 +6919,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(slotConfigNames != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotConfigNames, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -6937,7 +6969,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SlotConfigNamesResource>();
+            var _result = new AzureOperationResponse<PushSettings>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -6950,7 +6982,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SlotConfigNamesResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<PushSettings>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -6970,12 +7002,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the configuration of an app, such as platform version and bitness,
-        /// default documents, virtual applications, Always On, etc.
+        /// Gets the names of app settings and connection strings that stick to the
+        /// slot (not swapped).
         /// </summary>
         /// <remarks>
-        /// Gets the configuration of an app, such as platform version and bitness,
-        /// default documents, virtual applications, Always On, etc.
+        /// Description for Gets the names of app settings and connection strings that
+        /// stick to the slot (not swapped).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7004,7 +7036,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteConfigResource>> GetConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SlotConfigNamesResource>> ListSlotConfigurationNamesWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7033,7 +7065,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7043,20 +7078,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetConfiguration", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSlotConfigurationNames", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7146,7 +7180,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteConfigResource>();
+            var _result = new AzureOperationResponse<SlotConfigNamesResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7159,7 +7193,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteConfigResource>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SlotConfigNamesResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7179,10 +7213,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Updates the configuration of an app.
+        /// Updates the names of application settings and connection string that remain
+        /// with the slot during swap operation.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the names of application settings and connection
+        /// string that remain with the slot during swap operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7190,8 +7226,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='siteConfig'>
-        /// JSON representation of a SiteConfig object. See example.
+        /// <param name='slotConfigNames'>
+        /// Names of application settings and connection strings. See example.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -7214,7 +7250,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteConfigResource>> CreateOrUpdateConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, SiteConfigResource siteConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SlotConfigNamesResource>> UpdateSlotConfigurationNamesWithHttpMessagesAsync(string resourceGroupName, string name, SlotConfigNamesResource slotConfigNames, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7239,19 +7275,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (siteConfig == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "siteConfig");
-            }
-            if (siteConfig != null)
+            if (slotConfigNames == null)
             {
-                siteConfig.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "slotConfigNames");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7261,21 +7296,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("siteConfig", siteConfig);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("slotConfigNames", slotConfigNames);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateConfiguration", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateSlotConfigurationNames", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/slotConfigNames").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7315,9 +7349,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(siteConfig != null)
+            if(slotConfigNames != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteConfig, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotConfigNames, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -7371,6 +7405,217 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
+            var _result = new AzureOperationResponse<SlotConfigNamesResource>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SlotConfigNamesResource>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Gets the configuration of an app, such as platform version and bitness,
+        /// default documents, virtual applications, Always On, etc.
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets the configuration of an app, such as platform version
+        /// and bitness, default documents, virtual applications, Always On, etc.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<SiteConfigResource>> GetConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetConfiguration", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
             var _result = new AzureOperationResponse<SiteConfigResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
@@ -7407,7 +7652,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7439,7 +7684,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteConfigResource>> UpdateConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, SiteConfigResource siteConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteConfigResource>> CreateOrUpdateConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, SiteConfigResource siteConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7468,11 +7713,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "siteConfig");
             }
+            if (siteConfig != null)
+            {
+                siteConfig.Validate();
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7483,9 +7735,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteConfig", siteConfig);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateConfiguration", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateConfiguration", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -7494,9 +7745,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7505,7 +7756,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7625,12 +7876,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7638,6 +7887,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='siteConfig'>
+        /// JSON representation of a SiteConfig object. See example.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -7659,7 +7911,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteConfigResource>> UpdateConfigurationWithHttpMessagesAsync(string resourceGroupName, string name, SiteConfigResource siteConfig, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -7684,11 +7936,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (siteConfig == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "siteConfig");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7698,20 +7957,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("siteConfig", siteConfig);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfo", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateConfiguration", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -7720,7 +7979,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -7751,6 +8010,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(siteConfig != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteConfig, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -7801,7 +8066,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
+            var _result = new AzureOperationResponse<SiteConfigResource>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -7814,7 +8079,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteConfigResource>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -7834,10 +8099,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a snapshot of the configuration of an app at a previous point in time.
+        /// Gets a list of web app configuration snapshots identifiers. Each element of
+        /// the list contains a timestamp and the ID of the snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a snapshot of the configuration of an app at a previous point in time.
+        /// Description for Gets a list of web app configuration snapshots identifiers.
+        /// Each element of the list contains a timestamp and the ID of the snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -7845,9 +8112,219 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='snapshotId'>
-        /// The ID of the snapshot to read.
-        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfo", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/config/web/snapshots").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Gets a snapshot of the configuration of an app at a previous point in time.
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets a snapshot of the configuration of an app at a
+        /// previous point in time.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='snapshotId'>
+        /// The ID of the snapshot to read.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -7902,7 +8379,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -7913,7 +8393,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("snapshotId", snapshotId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetConfigurationSnapshot", tracingParameters);
             }
@@ -7925,9 +8404,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{snapshotId}", System.Uri.EscapeDataString(snapshotId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -8053,7 +8532,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Reverts the configuration of an app to a previous snapshot.
         /// </summary>
         /// <remarks>
-        /// Reverts the configuration of an app to a previous snapshot.
+        /// Description for Reverts the configuration of an app to a previous snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8070,7 +8549,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -8115,7 +8594,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -8126,7 +8608,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("snapshotId", snapshotId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RecoverSiteConfigurationSnapshot", tracingParameters);
             }
@@ -8138,9 +8619,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{snapshotId}", System.Uri.EscapeDataString(snapshotId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -8202,14 +8683,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -8219,10 +8699,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -8253,7 +8729,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the last lines of docker logs for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the last lines of docker logs for the given site
+        /// Description for Gets the last lines of docker logs for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8311,7 +8787,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -8321,7 +8800,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetWebSiteContainerLogs", tracingParameters);
             }
@@ -8332,9 +8810,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -8452,7 +8930,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the ZIP archived docker log files for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the ZIP archived docker log files for the given site
+        /// Description for Gets the ZIP archived docker log files for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8510,7 +8988,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -8520,7 +9001,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetContainerLogsZip", tracingParameters);
             }
@@ -8531,9 +9011,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -8651,7 +9131,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8709,7 +9189,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -8719,7 +9202,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobs", tracingParameters);
             }
@@ -8730,9 +9212,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -8858,7 +9340,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a continuous web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a continuous web job by its ID for an app, or a deployment slot.
+        /// Description for Gets a continuous web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -8875,7 +9358,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -8923,7 +9406,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -8934,7 +9420,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetContinuousWebJob", tracingParameters);
             }
@@ -8946,9 +9431,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -9010,14 +9495,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -9027,10 +9511,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -9079,7 +9559,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a continuous web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a continuous web job by its ID for an app, or a deployment slot.
+        /// Description for Delete a continuous web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9096,7 +9577,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -9141,7 +9622,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -9152,7 +9636,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteContinuousWebJob", tracingParameters);
             }
@@ -9164,9 +9647,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -9228,14 +9711,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -9245,10 +9727,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -9279,7 +9757,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Start a continuous web job for an app, or a deployment slot.
+        /// Description for Start a continuous web job for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9296,7 +9775,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -9341,7 +9820,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -9352,7 +9834,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StartContinuousWebJob", tracingParameters);
             }
@@ -9364,9 +9845,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -9428,14 +9909,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -9445,10 +9925,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -9479,7 +9955,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stop a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Stop a continuous web job for an app, or a deployment slot.
+        /// Description for Stop a continuous web job for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9496,7 +9972,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -9541,7 +10017,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -9552,7 +10031,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopContinuousWebJob", tracingParameters);
             }
@@ -9564,9 +10042,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -9628,14 +10106,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -9645,10 +10122,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -9679,7 +10152,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9737,7 +10210,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -9747,7 +10223,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDeployments", tracingParameters);
             }
@@ -9758,9 +10233,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -9886,7 +10361,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get a deployment by its ID for an app, or a deployment slot.
+        /// Description for Get a deployment by its ID for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -9951,7 +10427,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -9962,7 +10441,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDeployment", tracingParameters);
             }
@@ -9974,9 +10452,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{id}", System.Uri.EscapeDataString(id));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -10102,7 +10580,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create a deployment for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create a deployment for an app, or a deployment slot.
+        /// Description for Create a deployment for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10174,7 +10652,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -10186,7 +10667,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("deployment", deployment);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateDeployment", tracingParameters);
             }
@@ -10198,9 +10678,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{id}", System.Uri.EscapeDataString(id));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -10332,7 +10812,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a deployment by its ID for an app, or a deployment slot.
+        /// Description for Delete a deployment by its ID for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10349,7 +10830,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -10394,7 +10875,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -10405,7 +10889,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteDeployment", tracingParameters);
             }
@@ -10417,9 +10900,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{id}", System.Uri.EscapeDataString(id));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -10481,14 +10964,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -10498,10 +10980,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -10533,8 +11011,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List deployment log for specific deployment for an app, or a deployment
-        /// slot.
+        /// Description for List deployment log for specific deployment for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10600,7 +11078,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -10611,7 +11092,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentLog", tracingParameters);
             }
@@ -10623,9 +11103,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{id}", System.Uri.EscapeDataString(id));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -10753,9 +11233,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// backup.
         /// </summary>
         /// <remarks>
-        /// Discovers an existing app backup that can be restored from a blob in Azure
-        /// storage. Use this to get information about the databases stored in a
-        /// backup.
+        /// Description for Discovers an existing app backup that can be restored from
+        /// a blob in Azure storage. Use this to get information about the databases
+        /// stored in a backup.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -10825,7 +11305,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -10836,7 +11319,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DiscoverBackup", tracingParameters);
             }
@@ -10847,9 +11329,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -10981,7 +11463,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated with web
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11039,7 +11522,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -11049,7 +11535,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiers", tracingParameters);
             }
@@ -11060,9 +11545,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -11188,7 +11673,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get domain ownership identifier for web app.
         /// </summary>
         /// <remarks>
-        /// Get domain ownership identifier for web app.
+        /// Description for Get domain ownership identifier for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11253,7 +11738,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -11264,7 +11752,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDomainOwnershipIdentifier", tracingParameters);
             }
@@ -11276,9 +11763,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainOwnershipIdentifierName}", System.Uri.EscapeDataString(domainOwnershipIdentifierName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -11405,8 +11892,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an existing
-        /// ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app, or
+        /// updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11478,7 +11965,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -11490,7 +11980,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateDomainOwnershipIdentifier", tracingParameters);
             }
@@ -11502,9 +11991,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainOwnershipIdentifierName}", System.Uri.EscapeDataString(domainOwnershipIdentifierName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -11636,7 +12125,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a domain ownership identifier for a web app.
         /// </summary>
         /// <remarks>
-        /// Deletes a domain ownership identifier for a web app.
+        /// Description for Deletes a domain ownership identifier for a web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11653,7 +12142,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -11698,7 +12187,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -11709,7 +12201,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteDomainOwnershipIdentifier", tracingParameters);
             }
@@ -11721,9 +12212,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainOwnershipIdentifierName}", System.Uri.EscapeDataString(domainOwnershipIdentifierName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -11785,14 +12276,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -11802,10 +12292,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -11837,8 +12323,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an existing
-        /// ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app, or
+        /// updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -11910,7 +12396,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -11922,7 +12411,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateDomainOwnershipIdentifier", tracingParameters);
             }
@@ -11934,9 +12422,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{domainOwnershipIdentifierName}", System.Uri.EscapeDataString(domainOwnershipIdentifierName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -12068,7 +12556,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12126,7 +12614,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -12136,7 +12627,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetMSDeployStatus", tracingParameters);
             }
@@ -12147,9 +12637,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -12275,7 +12765,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12303,7 +12793,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12317,7 +12807,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -12361,7 +12851,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -12371,7 +12864,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetMSDeployLog", tracingParameters);
             }
@@ -12382,9 +12874,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -12446,14 +12938,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -12463,10 +12954,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -12515,7 +13002,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12529,7 +13016,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -12573,7 +13060,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -12583,7 +13073,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListFunctions", tracingParameters);
             }
@@ -12594,9 +13083,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -12658,14 +13147,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -12675,10 +13163,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -12727,7 +13211,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Fetch a short lived token that can be exchanged for a master key.
         /// </summary>
         /// <remarks>
-        /// Fetch a short lived token that can be exchanged for a master key.
+        /// Description for Fetch a short lived token that can be exchanged for a
+        /// master key.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12785,7 +13270,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -12795,7 +13283,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetFunctionsAdminToken", tracingParameters);
             }
@@ -12806,9 +13293,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -12934,7 +13421,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get function information by its ID for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get function information by its ID for web site, or a deployment slot.
+        /// Description for Get function information by its ID for web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -12951,7 +13439,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -12999,7 +13487,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -13010,7 +13501,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetFunction", tracingParameters);
             }
@@ -13022,9 +13512,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{functionName}", System.Uri.EscapeDataString(functionName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -13086,14 +13576,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -13103,10 +13592,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -13155,7 +13640,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -13186,7 +13671,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a function for web site, or a deployment slot.
+        /// Description for Delete a function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -13203,7 +13688,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -13248,7 +13733,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -13259,7 +13747,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteFunction", tracingParameters);
             }
@@ -13271,9 +13758,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{functionName}", System.Uri.EscapeDataString(functionName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -13335,14 +13822,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -13352,10 +13838,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -13386,7 +13868,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get function secrets for a function in a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get function secrets for a function in a web site, or a deployment slot.
+        /// Description for Get function secrets for a function in a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -13451,7 +13934,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -13462,7 +13948,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListFunctionSecrets", tracingParameters);
             }
@@ -13474,9 +13959,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{functionName}", System.Uri.EscapeDataString(functionName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -13602,7 +14087,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -13660,7 +14145,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -13670,7 +14158,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindings", tracingParameters);
             }
@@ -13681,9 +14168,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -13810,8 +14297,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named hostname binding for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named hostname binding for an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -13876,7 +14363,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -13887,7 +14377,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHostNameBinding", tracingParameters);
             }
@@ -13899,9 +14388,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{hostName}", System.Uri.EscapeDataString(hostName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -14027,7 +14516,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -14100,7 +14589,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -14112,7 +14604,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostName", hostName);
                 tracingParameters.Add("hostNameBinding", hostNameBinding);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateHostNameBinding", tracingParameters);
             }
@@ -14124,9 +14615,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{hostName}", System.Uri.EscapeDataString(hostName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -14258,7 +14749,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -14275,7 +14766,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -14320,7 +14811,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -14331,7 +14825,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteHostNameBinding", tracingParameters);
             }
@@ -14343,9 +14836,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{hostName}", System.Uri.EscapeDataString(hostName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -14407,14 +14900,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -14424,10 +14916,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -14458,7 +14946,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+        /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+        /// this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -14530,7 +15019,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -14542,7 +15034,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHybridConnection", tracingParameters);
             }
@@ -14555,9 +15046,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -14683,7 +15174,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -14762,7 +15253,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -14775,7 +15269,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateHybridConnection", tracingParameters);
             }
@@ -14788,9 +15281,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -14922,7 +15415,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Removes a Hybrid Connection from this site.
         /// </summary>
         /// <remarks>
-        /// Removes a Hybrid Connection from this site.
+        /// Description for Removes a Hybrid Connection from this site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -14942,7 +15435,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -14991,7 +15484,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -15003,7 +15499,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteHybridConnection", tracingParameters);
             }
@@ -15016,9 +15511,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -15080,14 +15575,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -15097,10 +15591,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -15131,7 +15621,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -15210,7 +15700,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -15223,7 +15716,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateHybridConnection", tracingParameters);
             }
@@ -15236,9 +15728,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -15367,10 +15859,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets the send key name and value for a Hybrid Connection.
+        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Gets the send key name and value for a Hybrid Connection.
+        /// Description for Retrieves all Service Bus Hybrid Connections used by this
+        /// Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -15378,12 +15871,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// The name of the web app.
         /// </param>
-        /// <param name='namespaceName'>
-        /// The namespace for this hybrid connection.
-        /// </param>
-        /// <param name='relayName'>
-        /// The relay name for this hybrid connection.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -15405,7 +15892,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<HybridConnectionKey>> ListHybridConnectionKeysWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<HybridConnection>> ListHybridConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -15430,19 +15917,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (namespaceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "namespaceName");
-            }
-            if (relayName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "relayName");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -15452,24 +15934,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("namespaceName", namespaceName);
-                tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionKeys", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnections", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}/listKeys").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridConnectionRelays").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{namespaceName}", System.Uri.EscapeDataString(namespaceName));
-            _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -15478,7 +15955,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -15559,7 +16036,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<HybridConnectionKey>();
+            var _result = new AzureOperationResponse<HybridConnection>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -15572,7 +16049,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnectionKey>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnection>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -15592,16 +16069,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+        /// Gets hybrid connections configured for an app (or deployment slot, if
+        /// specified).
         /// </summary>
         /// <remarks>
-        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+        /// Description for Gets hybrid connections configured for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// The name of the web app.
+        /// Name of the app.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -15624,7 +16103,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<HybridConnection>> ListHybridConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> ListRelayServiceConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -15653,7 +16132,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -15663,20 +16145,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnections", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListRelayServiceConnections", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridConnectionRelays").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -15766,7 +16247,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<HybridConnection>();
+            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -15779,7 +16260,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnection>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -15799,12 +16280,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets hybrid connections configured for an app (or deployment slot, if
-        /// specified).
+        /// Gets a hybrid connection configuration by its name.
         /// </summary>
         /// <remarks>
-        /// Gets hybrid connections configured for an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets a hybrid connection configuration by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -15812,6 +16291,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='entityName'>
+        /// Name of the hybrid connection.
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -15833,7 +16315,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> ListRelayServiceConnectionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> GetRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -15858,11 +16340,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (entityName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -15872,20 +16361,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("entityName", entityName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListRelayServiceConnections", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetRelayServiceConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection/{entityName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -16008,10 +16498,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a hybrid connection configuration by its name.
+        /// Creates a new hybrid connection configuration (PUT), or updates an existing
+        /// one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Gets a hybrid connection configuration by its name.
+        /// Description for Creates a new hybrid connection configuration (PUT), or
+        /// updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -16020,7 +16512,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of the app.
         /// </param>
         /// <param name='entityName'>
-        /// Name of the hybrid connection.
+        /// Name of the hybrid connection configuration.
+        /// </param>
+        /// <param name='connectionEnvelope'>
+        /// Details of the hybrid connection configuration.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -16043,7 +16538,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> GetRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> CreateOrUpdateRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -16072,11 +16567,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
             }
+            if (connectionEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -16087,9 +16589,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("entityName", entityName);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetRelayServiceConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateRelayServiceConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -16099,9 +16601,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -16110,7 +16612,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -16141,6 +16643,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -16224,12 +16732,209 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
+        /// Deletes a relay service connection by its name.
         /// </summary>
         /// <remarks>
+        /// Description for Deletes a relay service connection by its name.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='entityName'>
+        /// Name of the hybrid connection configuration.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse> DeleteRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (entityName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("entityName", entityName);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteRelayServiceConnection", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection/{entityName}").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
         /// Creates a new hybrid connection configuration (PUT), or updates an existing
         /// one (PATCH).
+        /// </summary>
+        /// <remarks>
+        /// Description for Creates a new hybrid connection configuration (PUT), or
+        /// updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -16264,7 +16969,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> CreateOrUpdateRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> UpdateRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -16301,7 +17006,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -16313,9 +17021,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("entityName", entityName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateRelayServiceConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateRelayServiceConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -16325,9 +17032,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -16336,7 +17043,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -16456,10 +17163,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Deletes a relay service connection by its name.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a relay service connection by its name.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -16467,18 +17174,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='entityName'>
-        /// Name of the hybrid connection configuration.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -16488,7 +17195,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> DeleteRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -16513,227 +17220,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (entityName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("entityName", entityName);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteRelayServiceConnection", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection/{entityName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
+            if (Client.ApiVersion == null)
             {
-                ServiceClientTracing.Exit(_invocationId, _result);
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            return _result;
-        }
-
-        /// <summary>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
-        /// </summary>
-        /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='entityName'>
-        /// Name of the hybrid connection configuration.
-        /// </param>
-        /// <param name='connectionEnvelope'>
-        /// Details of the hybrid connection configuration.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> UpdateRelayServiceConnectionWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (entityName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
-            }
-            if (connectionEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -16743,23 +17237,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("entityName", entityName);
-                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateRelayServiceConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiers", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/hybridconnection/{entityName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -16768,7 +17258,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -16799,12 +17289,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -16855,7 +17339,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
+            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -16868,7 +17352,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -16891,7 +17375,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -16899,6 +17383,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='instanceId'>
+        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -16920,7 +17406,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WebSiteInstanceStatus>> GetInstanceInfoWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -16945,11 +17431,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (instanceId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "instanceId");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -16959,20 +17452,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("instanceId", instanceId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiers", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceInfo", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -17062,7 +17556,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
+            var _result = new AzureOperationResponse<WebSiteInstanceStatus>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -17075,7 +17569,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WebSiteInstanceStatus>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -17098,7 +17592,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -17163,7 +17657,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -17174,7 +17671,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMsDeployStatus", tracingParameters);
             }
@@ -17186,9 +17682,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -17314,7 +17810,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -17345,7 +17841,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -17362,7 +17858,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -17410,7 +17906,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -17421,7 +17920,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMSDeployLog", tracingParameters);
             }
@@ -17433,9 +17931,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -17497,14 +17995,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -17514,10 +18011,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -17567,8 +18060,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -17586,7 +18079,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -17634,7 +18127,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -17645,7 +18141,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcesses", tracingParameters);
             }
@@ -17657,9 +18152,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -17721,14 +18216,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -17738,10 +18232,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -17791,8 +18281,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -17813,7 +18303,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -17865,7 +18355,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -17877,7 +18370,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcess", tracingParameters);
             }
@@ -17890,9 +18382,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -17954,14 +18446,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -17971,10 +18462,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -18024,8 +18511,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
-        /// specific scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -18046,7 +18533,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -18095,7 +18582,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -18107,7 +18597,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteInstanceProcess", tracingParameters);
             }
@@ -18120,9 +18609,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -18184,14 +18673,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -18201,10 +18689,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -18236,8 +18720,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get a memory dump of a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -18258,7 +18742,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -18310,7 +18794,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -18322,7 +18809,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessDump", tracingParameters);
             }
@@ -18335,9 +18821,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -18399,14 +18885,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -18416,10 +18901,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -18456,8 +18937,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -18478,7 +18959,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -18530,7 +19011,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -18542,7 +19026,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModules", tracingParameters);
             }
@@ -18555,9 +19038,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -18619,14 +19102,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -18636,10 +19118,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -18689,8 +19167,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -18714,7 +19192,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -18770,7 +19248,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -18783,7 +19264,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("baseAddress", baseAddress);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessModule", tracingParameters);
             }
@@ -18797,9 +19277,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -18861,14 +19341,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -18878,10 +19357,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -18931,8 +19406,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -18953,7 +19428,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -19005,7 +19480,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -19017,7 +19495,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreads", tracingParameters);
             }
@@ -19030,9 +19507,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -19094,14 +19571,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -19111,10 +19587,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -19160,28 +19632,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
+        /// Shows whether an app can be cloned to another resource group or
+        /// subscription.
         /// </summary>
         /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
+        /// Description for Shows whether an app can be cloned to another resource
+        /// group or subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
-        /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET api/sites/{siteName}/instances".
+        /// Name of the app.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -19189,7 +19651,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -19204,7 +19666,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessThreadInfo>> GetInstanceProcessThreadWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteCloneability>> IsCloneableWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -19229,23 +19691,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
-            if (threadId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "threadId");
-            }
-            if (instanceId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instanceId");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -19255,26 +19708,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
-                tracingParameters.Add("threadId", threadId);
-                tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessThread", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "IsCloneable", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/instances/{instanceId}/processes/{processId}/threads/{threadId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/iscloneable").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{threadId}", System.Uri.EscapeDataString(threadId));
-            _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -19283,7 +19729,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -19334,16 +19780,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -19353,10 +19798,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -19369,7 +19810,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessThreadInfo>();
+            var _result = new AzureOperationResponse<SiteCloneability>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -19382,7 +19823,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessThreadInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteCloneability>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -19402,12 +19843,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -19436,7 +19875,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteCloneability>> IsCloneableWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -19465,7 +19904,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -19475,20 +19917,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "IsCloneable", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSiteBackups", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/iscloneable").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/listbackups").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -19578,7 +20019,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteCloneability>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -19591,7 +20032,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteCloneability>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -19614,7 +20055,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// This is to allow calling via powershell and ARM template.
         /// </summary>
         /// <remarks>
-        /// This is to allow calling via powershell and ARM template.
+        /// Description for This is to allow calling via powershell and ARM template.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -19672,7 +20113,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -19682,7 +20126,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSyncFunctionTriggers", tracingParameters);
             }
@@ -19693,9 +20136,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -19818,16 +20261,78 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Restores a web app.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Description for Restores a web app.
         /// </remarks>
+        /// <param name='subscriptionName'>
+        /// Azure subscription.
+        /// </param>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
+        /// Name of web app.
+        /// </param>
+        /// <param name='migrationOptions'>
+        /// Migration migrationOptions.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<StorageMigrationResponse>> MigrateStorageWithHttpMessagesAsync(string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<StorageMigrationResponse> _response = await BeginMigrateStorageWithHttpMessagesAsync(subscriptionName, resourceGroupName, name, migrationOptions, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Migrates a local (in-app) MySql database to a remote MySql database.
+        /// </summary>
+        /// <remarks>
+        /// Description for Migrates a local (in-app) MySql database to a remote MySql
+        /// database.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
+        /// </param>
+        /// <param name='migrationRequestEnvelope'>
+        /// MySql migration options.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<Operation>> MigrateMySqlWithHttpMessagesAsync(string resourceGroupName, string name, MigrateMySqlRequest migrationRequestEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<Operation> _response = await BeginMigrateMySqlWithHttpMessagesAsync(resourceGroupName, name, migrationRequestEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Returns the status of MySql in app migration, if one is active, and whether
+        /// or not MySql in app is enabled
+        /// </summary>
+        /// <remarks>
+        /// Description for Returns the status of MySql in app migration, if one is
+        /// active, and whether or not MySql in app is enabled
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -19850,7 +20355,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<MigrateMySqlStatus>> GetMigrateMySqlStatusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -19879,7 +20384,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -19889,20 +20397,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefinitions", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetMigrateMySqlStatus", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migratemysql/status").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -19992,7 +20499,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<MigrateMySqlStatus>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -20005,7 +20512,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MigrateMySqlStatus>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -20025,10 +20532,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// Gets a Swift Virtual Network connection.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// Description for Gets a Swift Virtual Network connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -20036,16 +20543,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='details'>
-        /// Specify "true" to include metric details in the response. It is "false" by
-        /// default.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only metrics specified in the filter (using OData syntax). For
-        /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-        /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-        /// timeGrain eq duration'[Hour|Minute|Day]'.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -20067,7 +20564,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsWithHttpMessagesAsync(string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> GetSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -20096,7 +20593,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -20106,30 +20606,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetrics", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetSwiftVirtualNetworkConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkConfig/virtualNetwork").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
-            {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -20219,7 +20708,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<SwiftVirtualNetwork>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -20232,7 +20721,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SwiftVirtualNetwork>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -20252,77 +20741,26 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Restores a web app.
-        /// </summary>
-        /// <remarks>
-        /// Restores a web app.
-        /// </remarks>
-        /// <param name='subscriptionName'>
-        /// Azure subscription.
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='migrationOptions'>
-        /// Migration migrationOptions.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<StorageMigrationResponse>> MigrateStorageWithHttpMessagesAsync(string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<StorageMigrationResponse> _response = await BeginMigrateStorageWithHttpMessagesAsync(subscriptionName, resourceGroupName, name, migrationOptions, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Migrates a local (in-app) MySql database to a remote MySql database.
+        /// Integrates this Web App with a Virtual Network. This requires that 1)
+        /// "swiftSupported" is true when doing a GET against this resource, and 2)
+        /// that the target Subnet has already been delegated, and is not
+        /// in use by another App Service Plan other than the one this App is in.
         /// </summary>
         /// <remarks>
-        /// Migrates a local (in-app) MySql database to a remote MySql database.
+        /// Description for Integrates this Web App with a Virtual Network. This
+        /// requires that 1) "swiftSupported" is true when doing a GET against this
+        /// resource, and 2) that the target Subnet has already been delegated, and is
+        /// not
+        /// in use by another App Service Plan other than the one this App is in.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='migrationRequestEnvelope'>
-        /// MySql migration options.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<Operation>> MigrateMySqlWithHttpMessagesAsync(string resourceGroupName, string name, MigrateMySqlRequest migrationRequestEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<Operation> _response = await BeginMigrateMySqlWithHttpMessagesAsync(resourceGroupName, name, migrationRequestEnvelope, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Returns the status of MySql in app migration, if one is active, and whether
-        /// or not MySql in app is enabled
-        /// </summary>
-        /// <remarks>
-        /// Returns the status of MySql in app migration, if one is active, and whether
-        /// or not MySql in app is enabled
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
+        /// Name of the app.
         /// </param>
-        /// <param name='name'>
-        /// Name of web app.
+        /// <param name='connectionEnvelope'>
+        /// Properties of the Virtual Network connection. See example.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -20345,7 +20783,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<MigrateMySqlStatus>> GetMigrateMySqlStatusWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> CreateOrUpdateSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, SwiftVirtualNetwork connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -20370,11 +20808,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (connectionEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -20384,20 +20829,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetMigrateMySqlStatus", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateSwiftVirtualNetworkConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migratemysql/status").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkConfig/virtualNetwork").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -20406,7 +20851,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -20437,6 +20882,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -20487,7 +20938,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<MigrateMySqlStatus>();
+            var _result = new AzureOperationResponse<SwiftVirtualNetwork>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -20500,7 +20951,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MigrateMySqlStatus>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SwiftVirtualNetwork>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -20520,10 +20971,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a Swift Virtual Network connection.
+        /// Deletes a Swift Virtual Network connection from an app (or deployment
+        /// slot).
         /// </summary>
         /// <remarks>
-        /// Gets a Swift Virtual Network connection.
+        /// Description for Deletes a Swift Virtual Network connection from an app (or
+        /// deployment slot).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -20540,9 +20993,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -20552,7 +21002,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> GetSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> DeleteSwiftVirtualNetworkWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -20581,7 +21031,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -20591,9 +21044,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetSwiftVirtualNetworkConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteSwiftVirtualNetwork", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -20602,9 +21054,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -20613,7 +21065,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -20664,7 +21116,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -20694,31 +21146,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SwiftVirtualNetwork>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SwiftVirtualNetwork>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -20733,9 +21167,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in use by another App Service Plan other than the one this App is in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that 1)
-        /// "swiftSupported" is true when doing a GET against this resource, and 2)
-        /// that the target Subnet has already been delegated, and is not
+        /// Description for Integrates this Web App with a Virtual Network. This
+        /// requires that 1) "swiftSupported" is true when doing a GET against this
+        /// resource, and 2) that the target Subnet has already been delegated, and is
+        /// not
         /// in use by another App Service Plan other than the one this App is in.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -20768,7 +21203,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> CreateOrUpdateSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, SwiftVirtualNetwork connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> UpdateSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, SwiftVirtualNetwork connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -20801,7 +21236,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -20812,9 +21250,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateSwiftVirtualNetworkConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateSwiftVirtualNetworkConnection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -20823,9 +21260,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -20834,7 +21271,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -20954,209 +21391,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Deletes a Swift Virtual Network connection from an app (or deployment
-        /// slot).
-        /// </summary>
-        /// <remarks>
-        /// Deletes a Swift Virtual Network connection from an app (or deployment
-        /// slot).
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> DeleteSwiftVirtualNetworkWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteSwiftVirtualNetwork", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkConfig/virtualNetwork").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Integrates this Web App with a Virtual Network. This requires that 1)
-        /// "swiftSupported" is true when doing a GET against this resource, and 2)
-        /// that the target Subnet has already been delegated, and is not
-        /// in use by another App Service Plan other than the one this App is in.
+        /// Gets all network features used by the app (or deployment slot, if
+        /// specified).
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that 1)
-        /// "swiftSupported" is true when doing a GET against this resource, and 2)
-        /// that the target Subnet has already been delegated, and is not
-        /// in use by another App Service Plan other than the one this App is in.
+        /// Description for Gets all network features used by the app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -21164,8 +21404,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='connectionEnvelope'>
-        /// Properties of the Virtual Network connection. See example.
+        /// <param name='view'>
+        /// The type of view. This can either be "summary" or "detailed".
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -21188,7 +21428,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SwiftVirtualNetwork>> UpdateSwiftVirtualNetworkConnectionWithHttpMessagesAsync(string resourceGroupName, string name, SwiftVirtualNetwork connectionEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<NetworkFeatures>> ListNetworkFeaturesWithHttpMessagesAsync(string resourceGroupName, string name, string view, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -21213,15 +21453,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (connectionEnvelope == null)
+            if (view == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+                throw new ValidationException(ValidationRules.CannotBeNull, "view");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -21231,21 +21474,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("view", view);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateSwiftVirtualNetworkConnection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListNetworkFeatures", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkConfig/virtualNetwork").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkFeatures/{view}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{view}", System.Uri.EscapeDataString(view));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -21254,7 +21497,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -21285,12 +21528,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -21311,7 +21548,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -21341,7 +21578,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SwiftVirtualNetwork>();
+            var _result = new AzureOperationResponse<NetworkFeatures>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -21354,7 +21591,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SwiftVirtualNetwork>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<NetworkFeatures>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -21374,12 +21611,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all network features used by the app (or deployment slot, if
-        /// specified).
+        /// Gets a named operation for a network trace capturing (or deployment slot,
+        /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets all network features used by the app (or deployment slot, if
-        /// specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -21387,8 +21624,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='view'>
-        /// The type of view. This can either be "summary" or "detailed".
+        /// <param name='operationId'>
+        /// GUID of the operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -21396,7 +21633,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -21411,7 +21648,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<NetworkFeatures>> ListNetworkFeaturesWithHttpMessagesAsync(string resourceGroupName, string name, string view, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -21436,15 +21673,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (view == null)
+            if (operationId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "view");
+                throw new ValidationException(ValidationRules.CannotBeNull, "operationId");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -21454,22 +21694,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("view", view);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNetworkFeatures", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperation", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkFeatures/{view}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/operationresults/{operationId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{view}", System.Uri.EscapeDataString(view));
+            _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -21529,16 +21768,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -21548,10 +21786,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -21564,7 +21798,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<NetworkFeatures>();
+            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -21577,7 +21811,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<NetworkFeatures>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -21597,21 +21849,26 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Start capturing network packets for the site (To be deprecated).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Start capturing network packets for the site (To be
+        /// deprecated).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
+        /// The name of the web app.
         /// </param>
-        /// <param name='operationId'>
-        /// GUID of the operation.
+        /// <param name='durationInSeconds'>
+        /// The duration to keep capturing in seconds.
+        /// </param>
+        /// <param name='maxFrameLength'>
+        /// The maximum frame length in bytes (Optional).
+        /// </param>
+        /// <param name='sasUrl'>
+        /// The Blob URL to store capture file.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -21634,7 +21891,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<string>> StartWebSiteNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -21659,15 +21916,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (operationId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "operationId");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -21677,22 +21933,34 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("operationId", operationId);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("durationInSeconds", durationInSeconds);
+                tracingParameters.Add("maxFrameLength", maxFrameLength);
+                tracingParameters.Add("sasUrl", sasUrl);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperation", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "StartWebSiteNetworkTrace", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/operationresults/{operationId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/start").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (durationInSeconds != null)
+            {
+                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
+            }
+            if (maxFrameLength != null)
+            {
+                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
+            }
+            if (sasUrl != null)
+            {
+                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
+            }
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -21701,7 +21969,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -21752,7 +22020,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -21782,7 +22050,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
+            var _result = new AzureOperationResponse<string>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -21795,25 +22063,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<string>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -21833,10 +22083,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Start capturing network packets for the site (To be deprecated).
+        /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site (To be deprecated).
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -21854,6 +22104,31 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// The Blob URL to store capture file.
         /// </param>
         /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> StartWebSiteNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<IList<NetworkTrace>> _response = await BeginStartWebSiteNetworkTraceOperationWithHttpMessagesAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Stop ongoing capturing network packets for the site.
+        /// </summary>
+        /// <remarks>
+        /// Description for Stop ongoing capturing network packets for the site.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// The name of the web app.
+        /// </param>
+        /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
         /// <param name='cancellationToken'>
@@ -21862,9 +22137,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -21874,7 +22146,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<string>> StartWebSiteNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> StopWebSiteNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -21903,7 +22175,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -21913,35 +22188,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("durationInSeconds", durationInSeconds);
-                tracingParameters.Add("maxFrameLength", maxFrameLength);
-                tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "StartWebSiteNetworkTrace", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "StopWebSiteNetworkTrace", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/start").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/stop").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (durationInSeconds != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
-            }
-            if (maxFrameLength != null)
-            {
-                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
-            }
-            if (sasUrl != null)
-            {
-                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -22001,7 +22260,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -22031,31 +22290,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<string>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<string>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -22064,50 +22305,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Start capturing network packets for the site.
+        /// Gets a named operation for a network trace capturing (or deployment slot,
+        /// if specified).
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='durationInSeconds'>
-        /// The duration to keep capturing in seconds.
-        /// </param>
-        /// <param name='maxFrameLength'>
-        /// The maximum frame length in bytes (Optional).
-        /// </param>
-        /// <param name='sasUrl'>
-        /// The Blob URL to store capture file.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> StartWebSiteNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<IList<NetworkTrace>> _response = await BeginStartWebSiteNetworkTraceOperationWithHttpMessagesAsync(resourceGroupName, name, durationInSeconds, maxFrameLength, sasUrl, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Stop ongoing capturing network packets for the site.
-        /// </summary>
-        /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
+        /// Name of the app.
         /// </param>
-        /// <param name='name'>
-        /// The name of the web app.
+        /// <param name='operationId'>
+        /// GUID of the operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -22115,9 +22327,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -22127,7 +22342,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> StopWebSiteNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTracesWithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -22152,11 +22367,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (operationId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "operationId");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -22166,20 +22388,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "StopWebSiteNetworkTrace", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraces", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/stop").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/{operationId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -22188,7 +22411,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -22239,16 +22462,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 204)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -22258,10 +22480,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -22274,13 +22492,31 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -22293,8 +22529,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -22326,7 +22562,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTracesWithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTraceOperationV2WithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -22359,7 +22595,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -22370,21 +22609,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraces", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperationV2", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTrace/{operationId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTraces/current/operationresults/{operationId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -22444,7 +22682,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -22499,6 +22737,24 @@ internal WebAppsOperations(WebSiteManagementClient client)
                     throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
             }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -22511,8 +22767,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -22544,7 +22800,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTraceOperationV2WithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTracesV2WithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -22577,243 +22833,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("operationId", operationId);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperationV2", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/networkTraces/current/operationresults/{operationId}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion == null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
-        /// </summary>
-        /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='operationId'>
-        /// GUID of the operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> GetNetworkTracesV2WithHttpMessagesAsync(string resourceGroupName, string name, string operationId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (operationId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "operationId");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -22824,7 +22847,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTracesV2", tracingParameters);
             }
@@ -22836,9 +22858,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{operationId}", System.Uri.EscapeDataString(operationId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -22965,8 +22987,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Generates a new publishing password for an app (or deployment slot, if
-        /// specified).
+        /// Description for Generates a new publishing password for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -22980,7 +23002,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -23021,7 +23043,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -23031,7 +23056,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GenerateNewSitePublishingPassword", tracingParameters);
             }
@@ -23042,9 +23066,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -23106,14 +23130,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -23123,10 +23146,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -23157,7 +23176,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -23221,7 +23240,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -23232,7 +23254,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCounters", tracingParameters);
             }
@@ -23247,9 +23268,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -23375,7 +23396,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets web app's event logs.
         /// </summary>
         /// <remarks>
-        /// Gets web app's event logs.
+        /// Description for Gets web app's event logs.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -23433,7 +23454,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -23443,7 +23467,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSitePhpErrorLogFlag", tracingParameters);
             }
@@ -23454,9 +23477,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -23582,7 +23605,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the premier add-ons of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the premier add-ons of an app.
+        /// Description for Gets the premier add-ons of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -23640,7 +23663,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -23650,7 +23676,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPremierAddOns", tracingParameters);
             }
@@ -23661,9 +23686,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -23789,7 +23814,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a named add-on of an app.
+        /// Description for Gets a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -23854,7 +23879,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -23865,7 +23893,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPremierAddOn", tracingParameters);
             }
@@ -23877,9 +23904,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{premierAddOnName}", System.Uri.EscapeDataString(premierAddOnName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -24005,7 +24032,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -24081,7 +24108,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -24093,7 +24123,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("premierAddOn", premierAddOn);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "AddPremierAddOn", tracingParameters);
             }
@@ -24105,9 +24134,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{premierAddOnName}", System.Uri.EscapeDataString(premierAddOnName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -24239,7 +24268,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a premier add-on from an app.
         /// </summary>
         /// <remarks>
-        /// Delete a premier add-on from an app.
+        /// Description for Delete a premier add-on from an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -24256,7 +24285,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -24301,7 +24330,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -24312,7 +24344,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeletePremierAddOn", tracingParameters);
             }
@@ -24324,9 +24355,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{premierAddOnName}", System.Uri.EscapeDataString(premierAddOnName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -24388,14 +24419,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -24405,10 +24435,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -24439,7 +24465,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -24511,7 +24537,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -24523,7 +24552,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("premierAddOn", premierAddOn);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdatePremierAddOn", tracingParameters);
             }
@@ -24535,9 +24563,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{premierAddOnName}", System.Uri.EscapeDataString(premierAddOnName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -24670,8 +24698,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Gets data around private site access enablement and authorized Virtual
-        /// Networks that can access the site.
+        /// Description for Gets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -24729,7 +24757,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -24739,7 +24770,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPrivateAccess", tracingParameters);
             }
@@ -24750,9 +24780,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -24879,8 +24909,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Sets data around private site access enablement and authorized Virtual
-        /// Networks that can access the site.
+        /// Description for Sets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -24945,7 +24975,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -24956,7 +24989,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("access", access);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "PutPrivateAccessVnet", tracingParameters);
             }
@@ -24967,9 +24999,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -25102,8 +25134,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -25117,7 +25149,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -25161,7 +25193,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -25171,7 +25206,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListProcesses", tracingParameters);
             }
@@ -25182,9 +25216,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -25246,14 +25280,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -25263,10 +25296,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -25316,8 +25345,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -25334,7 +25363,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -25382,227 +25411,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetProcess", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<ProcessInfo>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            if (Client.ApiVersion == null)
             {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessInfo>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
-        /// specific scaled-out instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> DeleteProcessWithHttpMessagesAsync(string resourceGroupName, string name, string processId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -25613,9 +25425,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteProcess", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetProcess", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -25625,9 +25436,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -25636,7 +25447,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -25687,16 +25498,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -25706,10 +25516,223 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
+                if (_shouldTrace)
                 {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+                    ServiceClientTracing.Error(_invocationId, ex);
                 }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<ProcessInfo>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessInfo>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Terminate a process by its ID for a web site, or a deployment slot, or
+        /// specific scaled-out instance in a web site.
+        /// </summary>
+        /// <remarks>
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Site name.
+        /// </param>
+        /// <param name='processId'>
+        /// PID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse> DeleteProcessWithHttpMessagesAsync(string resourceGroupName, string name, string processId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (processId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("processId", processId);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteProcess", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("DELETE");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 204 && (int)_statusCode != 404)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -25741,8 +25764,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get a memory dump of a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -25759,7 +25782,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -25807,7 +25830,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -25818,7 +25844,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetProcessDump", tracingParameters);
             }
@@ -25830,9 +25855,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -25894,14 +25919,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -25911,10 +25935,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -25951,8 +25971,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -25969,7 +25989,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -26017,7 +26037,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -26028,7 +26051,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListProcessModules", tracingParameters);
             }
@@ -26040,9 +26062,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -26104,14 +26126,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -26121,10 +26142,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -26174,8 +26191,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -26195,7 +26212,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -26247,7 +26264,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -26259,7 +26279,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("baseAddress", baseAddress);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetProcessModule", tracingParameters);
             }
@@ -26272,9 +26291,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{baseAddress}", System.Uri.EscapeDataString(baseAddress));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -26336,14 +26355,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -26353,10 +26371,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -26406,8 +26420,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -26424,7 +26438,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -26472,7 +26486,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -26483,7 +26500,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListProcessThreads", tracingParameters);
             }
@@ -26495,9 +26511,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -26559,14 +26575,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -26576,10 +26591,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -26624,243 +26635,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
             return _result;
         }
 
-        /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<ProcessThreadInfo>> GetProcessThreadWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
-            if (threadId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "threadId");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
-                tracingParameters.Add("threadId", threadId);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetProcessThread", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/processes/{processId}/threads/{threadId}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{threadId}", System.Uri.EscapeDataString(threadId));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<ProcessThreadInfo>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessThreadInfo>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
         /// <summary>
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -26918,7 +26697,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -26928,7 +26710,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPublicCertificates", tracingParameters);
             }
@@ -26939,9 +26720,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -27068,8 +26849,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named public certificate for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named public certificate for an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -27134,7 +26915,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -27145,7 +26929,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPublicCertificate", tracingParameters);
             }
@@ -27157,9 +26940,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{publicCertificateName}", System.Uri.EscapeDataString(publicCertificateName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -27285,7 +27068,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -27358,7 +27141,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -27370,7 +27156,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
                 tracingParameters.Add("publicCertificate", publicCertificate);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdatePublicCertificate", tracingParameters);
             }
@@ -27382,9 +27167,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{publicCertificateName}", System.Uri.EscapeDataString(publicCertificateName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -27516,7 +27301,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -27533,7 +27318,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -27578,7 +27363,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -27589,7 +27377,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeletePublicCertificate", tracingParameters);
             }
@@ -27601,9 +27388,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{publicCertificateName}", System.Uri.EscapeDataString(publicCertificateName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -27665,14 +27452,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -27682,10 +27468,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -27716,7 +27498,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the publishing profile for an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets the publishing profile for an app (or deployment slot, if specified).
+        /// Description for Gets the publishing profile for an app (or deployment slot,
+        /// if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -27782,7 +27565,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -27793,7 +27579,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("publishingProfileOptions", publishingProfileOptions);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPublishingProfileXmlWithSecrets", tracingParameters);
             }
@@ -27804,9 +27589,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -27926,8 +27711,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// previously modified by calling the API with POST.
         /// </summary>
         /// <remarks>
-        /// Resets the configuration settings of the current slot if they were
-        /// previously modified by calling the API with POST.
+        /// Description for Resets the configuration settings of the current slot if
+        /// they were previously modified by calling the API with POST.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -27941,7 +27726,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -27982,7 +27767,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -27992,7 +27780,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResetProductionSlotConfig", tracingParameters);
             }
@@ -28003,9 +27790,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -28067,14 +27854,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -28084,10 +27870,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -28118,7 +27900,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restarts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Restarts an app (or deployment slot, if specified).
+        /// Description for Restarts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28140,7 +27922,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -28181,7 +27963,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -28193,7 +27978,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("softRestart", softRestart);
                 tracingParameters.Add("synchronous", synchronous);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Restart", tracingParameters);
             }
@@ -28212,9 +27996,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("synchronous={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(synchronous, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -28276,14 +28060,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -28293,10 +28076,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -28327,7 +28106,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28355,7 +28134,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28383,7 +28162,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28412,7 +28191,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28426,7 +28206,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -28470,7 +28250,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -28480,7 +28263,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteExtensions", tracingParameters);
             }
@@ -28491,9 +28273,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -28555,14 +28337,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -28572,10 +28353,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -28625,8 +28402,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get site extension information by its ID for a web site, or a deployment
-        /// slot.
+        /// Description for Get site extension information by its ID for a web site, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28643,7 +28420,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -28691,7 +28468,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -28702,7 +28482,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteExtension", tracingParameters);
             }
@@ -28714,9 +28493,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteExtensionId}", System.Uri.EscapeDataString(siteExtensionId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -28778,14 +28557,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -28795,10 +28573,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -28847,7 +28621,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28875,7 +28649,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Remove a site extension from a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Remove a site extension from a web site, or a deployment slot.
+        /// Description for Remove a site extension from a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -28892,7 +28667,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -28937,7 +28712,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -28948,7 +28726,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSiteExtension", tracingParameters);
             }
@@ -28960,9 +28737,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteExtensionId}", System.Uri.EscapeDataString(siteExtensionId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -29024,14 +28801,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -29041,10 +28817,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -29072,10 +28844,40 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets an app's deployment slots.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot of an
+        /// app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config properties
+        /// to override the source slot config. See example.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse> CopyProductionSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse _response = await BeginCopyProductionSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
         /// Gets an app's deployment slots.
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets an app's deployment slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -29133,7 +28935,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -29143,7 +28948,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSlots", tracingParameters);
             }
@@ -29154,9 +28958,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -29282,7 +29086,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the details of a web, mobile, or API app.
         /// </summary>
         /// <remarks>
-        /// Gets the details of a web, mobile, or API app.
+        /// Description for Gets the details of a web, mobile, or API app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -29300,7 +29104,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -29348,7 +29152,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -29359,7 +29166,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSlot", tracingParameters);
             }
@@ -29371,9 +29177,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -29435,14 +29241,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -29452,10 +29257,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -29505,8 +29306,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -29539,7 +29340,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a web, mobile, or API app, or one of the deployment slots.
         /// </summary>
         /// <remarks>
-        /// Deletes a web, mobile, or API app, or one of the deployment slots.
+        /// Description for Deletes a web, mobile, or API app, or one of the deployment
+        /// slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -29565,7 +29367,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -29610,7 +29412,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -29623,7 +29428,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("deleteMetrics", deleteMetrics);
                 tracingParameters.Add("deleteEmptyServerFarm", deleteEmptyServerFarm);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSlot", tracingParameters);
             }
@@ -29643,9 +29447,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("deleteEmptyServerFarm={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(deleteEmptyServerFarm, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -29707,14 +29511,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -29724,10 +29527,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -29759,8 +29558,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -29834,7 +29633,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -29846,7 +29648,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteEnvelope", siteEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSlot", tracingParameters);
             }
@@ -29858,9 +29659,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -30010,7 +29811,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Analyze a custom hostname.
         /// </summary>
         /// <remarks>
-        /// Analyze a custom hostname.
+        /// Description for Analyze a custom hostname.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -30079,7 +29880,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -30091,7 +29895,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "AnalyzeCustomHostnameSlot", tracingParameters);
             }
@@ -30107,9 +29910,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("hostName={0}", System.Uri.EscapeDataString(hostName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -30236,8 +30039,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Applies the configuration settings from the target slot onto the current
-        /// slot.
+        /// Description for Applies the configuration settings from the target slot
+        /// onto the current slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -30258,7 +30061,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -30311,7 +30114,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -30323,7 +30129,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slotSwapEntity", slotSwapEntity);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ApplySlotConfigurationSlot", tracingParameters);
             }
@@ -30335,9 +30140,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -30405,14 +30210,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -30422,10 +30226,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -30456,7 +30256,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a backup of an app.
         /// </summary>
         /// <remarks>
-        /// Creates a backup of an app.
+        /// Description for Creates a backup of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -30534,7 +30334,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -30546,7 +30349,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BackupSlot", tracingParameters);
             }
@@ -30558,9 +30360,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -30692,7 +30494,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -30758,7 +30560,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -30769,7 +30574,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBackupsSlot", tracingParameters);
             }
@@ -30781,9 +30585,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -30909,7 +30713,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Gets a backup of an app by its ID.
+        /// Description for Gets a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -30982,7 +30786,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -30994,7 +30801,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBackupStatusSlot", tracingParameters);
             }
@@ -31007,9 +30813,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -31135,7 +30941,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a backup of an app by its ID.
         /// </summary>
         /// <remarks>
-        /// Deletes a backup of an app by its ID.
+        /// Description for Deletes a backup of an app by its ID.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -31156,7 +30962,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -31205,7 +31011,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -31217,7 +31026,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteBackupSlot", tracingParameters);
             }
@@ -31230,9 +31038,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -31294,14 +31102,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -31311,10 +31118,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -31348,10 +31151,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// request body.
         /// </summary>
         /// <remarks>
-        /// Gets status of a web app backup that may be in progress, including secrets
-        /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-        /// used to update the SAS URL for the backup if a new URL is passed in the
-        /// request body.
+        /// Description for Gets status of a web app backup that may be in progress,
+        /// including secrets associated with the backup, such as the Azure Storage SAS
+        /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+        /// passed in the request body.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -31435,7 +31238,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -31448,7 +31254,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBackupStatusSecretsSlot", tracingParameters);
             }
@@ -31461,9 +31266,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -31596,8 +31401,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -31632,7 +31437,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -31698,7 +31503,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -31709,7 +31517,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsSlot", tracingParameters);
             }
@@ -31721,9 +31528,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -31849,7 +31656,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Replaces the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the application settings of an app.
+        /// Description for Replaces the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -31922,7 +31729,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -31934,7 +31744,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("appSettings", appSettings);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateApplicationSettingsSlot", tracingParameters);
             }
@@ -31946,9 +31755,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -32080,7 +31889,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the application settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the application settings of an app.
+        /// Description for Gets the application settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -32146,7 +31955,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -32157,7 +31969,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListApplicationSettingsSlot", tracingParameters);
             }
@@ -32169,9 +31980,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -32298,8 +32109,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// app.
         /// </summary>
         /// <remarks>
-        /// Updates the Authentication / Authorization settings associated with web
-        /// app.
+        /// Description for Updates the Authentication / Authorization settings
+        /// associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -32372,7 +32183,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -32384,7 +32198,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteAuthSettings", siteAuthSettings);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateAuthSettingsSlot", tracingParameters);
             }
@@ -32396,9 +32209,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -32530,7 +32343,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Authentication/Authorization settings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Authentication/Authorization settings of an app.
+        /// Description for Gets the Authentication/Authorization settings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -32596,7 +32409,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -32607,7 +32423,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetAuthSettingsSlot", tracingParameters);
             }
@@ -32619,9 +32434,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -32747,7 +32562,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the Azure storage account configurations of an app.
+        /// Description for Updates the Azure storage account configurations of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -32820,7 +32635,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -32832,7 +32650,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("azureStorageAccounts", azureStorageAccounts);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateAzureStorageAccountsSlot", tracingParameters);
             }
@@ -32844,9 +32661,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -32978,7 +32795,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Azure storage account configurations of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Azure storage account configurations of an app.
+        /// Description for Gets the Azure storage account configurations of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -33044,7 +32861,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -33055,7 +32875,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListAzureStorageAccountsSlot", tracingParameters);
             }
@@ -33067,9 +32886,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -33195,7 +33014,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the backup configuration of an app.
+        /// Description for Updates the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -33272,7 +33091,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -33284,7 +33106,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateBackupConfigurationSlot", tracingParameters);
             }
@@ -33296,9 +33117,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -33430,7 +33251,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the backup configuration of an app.
+        /// Description for Deletes the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -33448,7 +33269,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -33493,7 +33314,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -33504,7 +33328,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteBackupConfigurationSlot", tracingParameters);
             }
@@ -33516,9 +33339,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -33580,14 +33403,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -33597,10 +33419,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -33631,7 +33449,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the backup configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the backup configuration of an app.
+        /// Description for Gets the backup configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -33697,7 +33515,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -33708,7 +33529,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetBackupConfigurationSlot", tracingParameters);
             }
@@ -33720,9 +33540,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -33848,7 +33668,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Replaces the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the connection strings of an app.
+        /// Description for Replaces the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -33921,7 +33741,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -33933,7 +33756,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("connectionStrings", connectionStrings);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateConnectionStringsSlot", tracingParameters);
             }
@@ -33945,9 +33767,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -34079,7 +33901,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the connection strings of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the connection strings of an app.
+        /// Description for Gets the connection strings of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -34145,7 +33967,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -34156,7 +33981,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListConnectionStringsSlot", tracingParameters);
             }
@@ -34168,9 +33992,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -34296,7 +34120,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the logging configuration of an app.
+        /// Description for Gets the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -34362,7 +34186,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -34373,7 +34200,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDiagnosticLogsConfigurationSlot", tracingParameters);
             }
@@ -34385,9 +34211,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -34513,7 +34339,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the logging configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the logging configuration of an app.
+        /// Description for Updates the logging configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -34591,7 +34417,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -34603,7 +34432,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteLogsConfig", siteLogsConfig);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateDiagnosticLogsConfigSlot", tracingParameters);
             }
@@ -34615,9 +34443,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -34749,7 +34577,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Replaces the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Replaces the metadata of an app.
+        /// Description for Replaces the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -34822,7 +34650,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -34834,7 +34665,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("metadata", metadata);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateMetadataSlot", tracingParameters);
             }
@@ -34846,9 +34676,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -34980,7 +34810,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the metadata of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the metadata of an app.
+        /// Description for Gets the metadata of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35046,7 +34876,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -35057,7 +34890,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListMetadataSlot", tracingParameters);
             }
@@ -35069,9 +34901,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -35197,7 +35029,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35226,7 +35058,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Updates the Push settings associated with web app.
+        /// Description for Updates the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35303,7 +35135,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -35315,7 +35150,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("pushSettings", pushSettings);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSitePushSettingsSlot", tracingParameters);
             }
@@ -35327,9 +35161,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -35461,7 +35295,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Push settings associated with web app.
         /// </summary>
         /// <remarks>
-        /// Gets the Push settings associated with web app.
+        /// Description for Gets the Push settings associated with web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35527,7 +35361,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -35538,7 +35375,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSitePushSettingsSlot", tracingParameters);
             }
@@ -35550,9 +35386,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -35679,8 +35515,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// default documents, virtual applications, Always On, etc.
         /// </summary>
         /// <remarks>
-        /// Gets the configuration of an app, such as platform version and bitness,
-        /// default documents, virtual applications, Always On, etc.
+        /// Description for Gets the configuration of an app, such as platform version
+        /// and bitness, default documents, virtual applications, Always On, etc.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35746,7 +35582,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -35757,7 +35596,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetConfigurationSlot", tracingParameters);
             }
@@ -35769,9 +35607,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -35897,7 +35735,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -35974,7 +35812,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -35986,7 +35827,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteConfig", siteConfig);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateConfigurationSlot", tracingParameters);
             }
@@ -35998,9 +35838,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -36132,7 +35972,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the configuration of an app.
+        /// Description for Updates the configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -36205,7 +36045,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -36217,7 +36060,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteConfig", siteConfig);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateConfigurationSlot", tracingParameters);
             }
@@ -36229,9 +36071,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -36364,8 +36206,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// the list contains a timestamp and the ID of the snapshot.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Description for Gets a list of web app configuration snapshots identifiers.
+        /// Each element of the list contains a timestamp and the ID of the snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -36431,7 +36273,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -36442,7 +36287,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfoSlot", tracingParameters);
             }
@@ -36454,9 +36298,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -36582,7 +36426,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a snapshot of the configuration of an app at a previous point in time.
         /// </summary>
         /// <remarks>
-        /// Gets a snapshot of the configuration of an app at a previous point in time.
+        /// Description for Gets a snapshot of the configuration of an app at a
+        /// previous point in time.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -36655,7 +36500,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -36667,7 +36515,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("snapshotId", snapshotId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetConfigurationSnapshotSlot", tracingParameters);
             }
@@ -36680,9 +36527,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -36808,7 +36655,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Reverts the configuration of an app to a previous snapshot.
         /// </summary>
         /// <remarks>
-        /// Reverts the configuration of an app to a previous snapshot.
+        /// Description for Reverts the configuration of an app to a previous snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -36829,7 +36676,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -36878,7 +36725,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -36890,7 +36740,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("snapshotId", snapshotId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RecoverSiteConfigurationSnapshotSlot", tracingParameters);
             }
@@ -36903,9 +36752,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -36967,14 +36816,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -36984,10 +36832,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -37018,7 +36862,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the last lines of docker logs for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the last lines of docker logs for the given site
+        /// Description for Gets the last lines of docker logs for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -37084,7 +36928,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -37095,7 +36942,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetWebSiteContainerLogsSlot", tracingParameters);
             }
@@ -37107,9 +36953,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -37227,7 +37073,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the ZIP archived docker log files for the given site
         /// </summary>
         /// <remarks>
-        /// Gets the ZIP archived docker log files for the given site
+        /// Description for Gets the ZIP archived docker log files for the given site
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -37293,7 +37139,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -37304,7 +37153,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetContainerLogsZipSlot", tracingParameters);
             }
@@ -37316,9 +37164,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -37436,7 +37284,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -37502,7 +37350,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -37513,7 +37364,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobsSlot", tracingParameters);
             }
@@ -37525,9 +37375,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -37653,7 +37503,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a continuous web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a continuous web job by its ID for an app, or a deployment slot.
+        /// Description for Gets a continuous web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -37674,7 +37525,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -37726,7 +37577,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -37738,7 +37592,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetContinuousWebJobSlot", tracingParameters);
             }
@@ -37751,9 +37604,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -37815,14 +37668,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -37832,10 +37684,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -37884,7 +37732,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a continuous web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a continuous web job by its ID for an app, or a deployment slot.
+        /// Description for Delete a continuous web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -37905,7 +37754,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -37954,7 +37803,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -37966,7 +37818,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteContinuousWebJobSlot", tracingParameters);
             }
@@ -37979,9 +37830,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -38043,14 +37894,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -38060,10 +37910,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -38094,7 +37940,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Start a continuous web job for an app, or a deployment slot.
+        /// Description for Start a continuous web job for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -38115,7 +37962,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -38164,7 +38011,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -38176,7 +38026,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StartContinuousWebJobSlot", tracingParameters);
             }
@@ -38189,9 +38038,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -38253,14 +38102,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -38270,10 +38118,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -38304,7 +38148,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stop a continuous web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Stop a continuous web job for an app, or a deployment slot.
+        /// Description for Stop a continuous web job for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -38325,7 +38169,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -38374,7 +38218,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -38386,7 +38233,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopContinuousWebJobSlot", tracingParameters);
             }
@@ -38399,9 +38245,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -38463,14 +38309,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -38480,10 +38325,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -38514,7 +38355,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -38580,7 +38421,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -38591,7 +38435,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentsSlot", tracingParameters);
             }
@@ -38603,9 +38446,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -38731,7 +38574,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get a deployment by its ID for an app, or a deployment slot.
+        /// Description for Get a deployment by its ID for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -38804,7 +38648,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -38816,7 +38663,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDeploymentSlot", tracingParameters);
             }
@@ -38829,9 +38675,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -38957,7 +38803,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create a deployment for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create a deployment for an app, or a deployment slot.
+        /// Description for Create a deployment for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -39037,7 +38883,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -39050,7 +38899,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("deployment", deployment);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateDeploymentSlot", tracingParameters);
             }
@@ -39063,9 +38911,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -39197,7 +39045,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a deployment by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a deployment by its ID for an app, or a deployment slot.
+        /// Description for Delete a deployment by its ID for an app, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -39218,7 +39067,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -39267,7 +39116,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -39279,7 +39131,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteDeploymentSlot", tracingParameters);
             }
@@ -39292,9 +39143,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -39356,14 +39207,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -39373,10 +39223,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -39408,8 +39254,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// List deployment log for specific deployment for an app, or a deployment
-        /// slot.
+        /// Description for List deployment log for specific deployment for an app, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -39483,7 +39329,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -39495,7 +39344,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentLogSlot", tracingParameters);
             }
@@ -39508,9 +39356,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -39638,9 +39486,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// backup.
         /// </summary>
         /// <remarks>
-        /// Discovers an existing app backup that can be restored from a blob in Azure
-        /// storage. Use this to get information about the databases stored in a
-        /// backup.
+        /// Description for Discovers an existing app backup that can be restored from
+        /// a blob in Azure storage. Use this to get information about the databases
+        /// stored in a backup.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -39718,7 +39566,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -39730,7 +39581,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DiscoverBackupSlot", tracingParameters);
             }
@@ -39742,9 +39592,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -39876,7 +39726,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for Lists ownership identifiers for domain associated with web
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -39942,7 +39793,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -39953,7 +39807,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiersSlot", tracingParameters);
             }
@@ -39965,9 +39818,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -40093,7 +39946,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get domain ownership identifier for web app.
         /// </summary>
         /// <remarks>
-        /// Get domain ownership identifier for web app.
+        /// Description for Get domain ownership identifier for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -40166,7 +40019,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -40178,7 +40034,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetDomainOwnershipIdentifierSlot", tracingParameters);
             }
@@ -40191,9 +40046,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -40320,8 +40175,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an existing
-        /// ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app, or
+        /// updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -40401,7 +40256,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -40414,7 +40272,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateDomainOwnershipIdentifierSlot", tracingParameters);
             }
@@ -40427,9 +40284,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -40561,7 +40418,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a domain ownership identifier for a web app.
         /// </summary>
         /// <remarks>
-        /// Deletes a domain ownership identifier for a web app.
+        /// Description for Deletes a domain ownership identifier for a web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -40582,7 +40439,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -40631,7 +40488,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -40643,7 +40503,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteDomainOwnershipIdentifierSlot", tracingParameters);
             }
@@ -40656,9 +40515,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -40720,14 +40579,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -40737,10 +40595,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -40772,8 +40626,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// ownership identifier.
         /// </summary>
         /// <remarks>
-        /// Creates a domain ownership identifier for web app, or updates an existing
-        /// ownership identifier.
+        /// Description for Creates a domain ownership identifier for web app, or
+        /// updates an existing ownership identifier.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -40853,7 +40707,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -40866,7 +40723,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("domainOwnershipIdentifierName", domainOwnershipIdentifierName);
                 tracingParameters.Add("domainOwnershipIdentifier", domainOwnershipIdentifier);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateDomainOwnershipIdentifierSlot", tracingParameters);
             }
@@ -40879,9 +40735,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -41013,7 +40869,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41079,7 +40935,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -41090,7 +40949,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetMSDeployStatusSlot", tracingParameters);
             }
@@ -41102,9 +40960,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -41230,7 +41088,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41262,7 +41120,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the MSDeploy Log for the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// Description for Get the MSDeploy Log for the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41280,7 +41138,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -41328,7 +41186,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -41339,7 +41200,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetMSDeployLogSlot", tracingParameters);
             }
@@ -41351,9 +41211,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -41415,14 +41275,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -41432,10 +41291,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -41484,7 +41339,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41493,8 +41348,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Site name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -41502,7 +41356,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -41550,7 +41404,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -41561,7 +41418,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListInstanceFunctionsSlot", tracingParameters);
             }
@@ -41573,9 +41429,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -41637,14 +41493,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -41654,10 +41509,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -41706,7 +41557,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Fetch a short lived token that can be exchanged for a master key.
         /// </summary>
         /// <remarks>
-        /// Fetch a short lived token that can be exchanged for a master key.
+        /// Description for Fetch a short lived token that can be exchanged for a
+        /// master key.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41772,7 +41624,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -41783,7 +41638,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetFunctionsAdminTokenSlot", tracingParameters);
             }
@@ -41795,9 +41649,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -41923,7 +41777,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get function information by its ID for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get function information by its ID for web site, or a deployment slot.
+        /// Description for Get function information by its ID for web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -41935,8 +41790,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -41944,7 +41798,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -41996,7 +41850,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -42008,7 +41865,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetInstanceFunctionSlot", tracingParameters);
             }
@@ -42021,9 +41877,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -42085,14 +41941,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -42102,10 +41957,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -42154,7 +42005,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -42166,8 +42017,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='functionEnvelope'>
         /// Function details.
@@ -42189,7 +42039,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a function for web site, or a deployment slot.
+        /// Description for Delete a function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -42201,8 +42051,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -42210,7 +42059,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -42259,7 +42108,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -42271,7 +42123,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteInstanceFunctionSlot", tracingParameters);
             }
@@ -42284,9 +42135,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -42348,14 +42199,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -42365,10 +42215,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -42399,7 +42245,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get function secrets for a function in a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get function secrets for a function in a web site, or a deployment slot.
+        /// Description for Get function secrets for a function in a web site, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -42411,8 +42258,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -42472,7 +42318,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -42484,7 +42333,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListFunctionSecretsSlot", tracingParameters);
             }
@@ -42497,9 +42345,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -42625,7 +42473,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Get hostname bindings for an app or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -42691,7 +42539,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -42702,7 +42553,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindingsSlot", tracingParameters);
             }
@@ -42714,9 +42564,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -42843,8 +42693,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named hostname binding for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named hostname binding for an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -42917,7 +42767,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -42929,7 +42782,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHostNameBindingSlot", tracingParameters);
             }
@@ -42942,9 +42794,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{hostName}", System.Uri.EscapeDataString(hostName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -43070,7 +42922,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -43151,7 +43003,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -43164,7 +43019,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("hostName", hostName);
                 tracingParameters.Add("hostNameBinding", hostNameBinding);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateHostNameBindingSlot", tracingParameters);
             }
@@ -43177,9 +43031,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -43311,7 +43165,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -43332,7 +43186,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -43381,7 +43235,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -43393,7 +43250,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("hostName", hostName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteHostNameBindingSlot", tracingParameters);
             }
@@ -43406,9 +43262,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{hostName}", System.Uri.EscapeDataString(hostName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -43470,14 +43326,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -43487,10 +43342,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -43521,7 +43372,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+        /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+        /// this Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -43600,7 +43452,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -43613,7 +43468,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetHybridConnectionSlot", tracingParameters);
             }
@@ -43627,9 +43481,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -43755,7 +43609,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -43841,7 +43695,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -43855,7 +43712,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("relayName", relayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateHybridConnectionSlot", tracingParameters);
             }
@@ -43869,9 +43725,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -44003,7 +43859,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Removes a Hybrid Connection from this site.
         /// </summary>
         /// <remarks>
-        /// Removes a Hybrid Connection from this site.
+        /// Description for Removes a Hybrid Connection from this site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -44026,7 +43882,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -44079,7 +43935,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -44092,7 +43951,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteHybridConnectionSlot", tracingParameters);
             }
@@ -44106,9 +43964,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -44170,14 +44028,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -44187,10 +44044,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -44221,7 +44074,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a new Hybrid Connection using a Service Bus relay.
         /// </summary>
         /// <remarks>
-        /// Creates a new Hybrid Connection using a Service Bus relay.
+        /// Description for Creates a new Hybrid Connection using a Service Bus relay.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -44295,251 +44148,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "relayName");
             }
-            if (connectionEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
-            }
-            if (slot == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("namespaceName", namespaceName);
-                tracingParameters.Add("relayName", relayName);
-                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateHybridConnectionSlot", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{namespaceName}", System.Uri.EscapeDataString(namespaceName));
-            _url = _url.Replace("{relayName}", System.Uri.EscapeDataString(relayName));
-            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<HybridConnection>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnection>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </summary>
-        /// <remarks>
-        /// Gets the send key name and value for a Hybrid Connection.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='namespaceName'>
-        /// The namespace for this hybrid connection.
-        /// </param>
-        /// <param name='relayName'>
-        /// The relay name for this hybrid connection.
-        /// </param>
-        /// <param name='slot'>
-        /// The name of the slot for the web app.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<HybridConnectionKey>> ListHybridConnectionKeysSlotWithHttpMessagesAsync(string resourceGroupName, string name, string namespaceName, string relayName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (namespaceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "namespaceName");
-            }
-            if (relayName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "relayName");
-            }
+            if (connectionEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -44548,7 +44160,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -44560,14 +44175,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("namespaceName", namespaceName);
                 tracingParameters.Add("relayName", relayName);
+                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionKeysSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateHybridConnectionSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}/listKeys").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridConnectionNamespaces/{namespaceName}/relays/{relayName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{namespaceName}", System.Uri.EscapeDataString(namespaceName));
@@ -44575,9 +44190,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -44586,7 +44201,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -44617,6 +44232,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -44667,7 +44288,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<HybridConnectionKey>();
+            var _result = new AzureOperationResponse<HybridConnection>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -44680,7 +44301,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnectionKey>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<HybridConnection>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -44703,7 +44324,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Retrieves all Service Bus Hybrid Connections used by this Web App.
         /// </summary>
         /// <remarks>
-        /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+        /// Description for Retrieves all Service Bus Hybrid Connections used by this
+        /// Web App.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -44768,7 +44390,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -44779,7 +44404,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListHybridConnectionsSlot", tracingParameters);
             }
@@ -44791,9 +44415,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -44920,8 +44544,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets hybrid connections configured for an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets hybrid connections configured for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -44987,7 +44611,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -44998,7 +44625,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListRelayServiceConnectionsSlot", tracingParameters);
             }
@@ -45010,9 +44636,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -45138,7 +44764,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a hybrid connection configuration by its name.
         /// </summary>
         /// <remarks>
-        /// Gets a hybrid connection configuration by its name.
+        /// Description for Gets a hybrid connection configuration by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -45211,7 +44837,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -45223,7 +44852,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("entityName", entityName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetRelayServiceConnectionSlot", tracingParameters);
             }
@@ -45236,9 +44864,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -45365,8 +44993,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
+        /// Description for Creates a new hybrid connection configuration (PUT), or
+        /// updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -45446,7 +45074,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -45459,7 +45090,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("entityName", entityName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateRelayServiceConnectionSlot", tracingParameters);
             }
@@ -45472,9 +45102,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -45514,235 +45144,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Deletes a relay service connection by its name.
-        /// </summary>
-        /// <remarks>
-        /// Deletes a relay service connection by its name.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of the app.
-        /// </param>
-        /// <param name='entityName'>
-        /// Name of the hybrid connection configuration.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API will
-        /// delete a hybrid connection for the production slot.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse> DeleteRelayServiceConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (entityName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
-            }
-            if (slot == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("entityName", entityName);
-                tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteRelayServiceConnectionSlot", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridconnection/{entityName}").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
-            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -45763,16 +45170,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -45782,10 +45188,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -45798,13 +45200,31 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -45813,12 +45233,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
+        /// Deletes a relay service connection by its name.
         /// </summary>
         /// <remarks>
-        /// Creates a new hybrid connection configuration (PUT), or updates an existing
-        /// one (PATCH).
+        /// Description for Deletes a relay service connection by its name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -45829,12 +45247,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='entityName'>
         /// Name of the hybrid connection configuration.
         /// </param>
-        /// <param name='connectionEnvelope'>
-        /// Details of the hybrid connection configuration.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API will
-        /// create or update a hybrid connection for the production slot.
+        /// delete a hybrid connection for the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -45845,9 +45260,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -45857,7 +45269,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> UpdateRelayServiceConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> DeleteRelayServiceConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -45886,10 +45298,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
             }
-            if (connectionEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -45898,7 +45306,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -45909,11 +45320,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("entityName", entityName);
-                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateRelayServiceConnectionSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteRelayServiceConnectionSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
@@ -45924,9 +45333,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -45935,7 +45344,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PATCH");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -45966,12 +45375,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(connectionEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -45992,7 +45395,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -46022,31 +45425,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -46055,10 +45440,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all scale-out instances of an app.
+        /// Creates a new hybrid connection configuration (PUT), or updates an existing
+        /// one (PATCH).
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Creates a new hybrid connection configuration (PUT), or
+        /// updates an existing one (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -46066,9 +45453,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
+        /// <param name='entityName'>
+        /// Name of the hybrid connection configuration.
+        /// </param>
+        /// <param name='connectionEnvelope'>
+        /// Details of the hybrid connection configuration.
+        /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API gets the
-        /// production slot instances.
+        /// Name of the deployment slot. If a slot is not specified, the API will
+        /// create or update a hybrid connection for the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -46091,7 +45484,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<RelayServiceConnectionEntity>> UpdateRelayServiceConnectionSlotWithHttpMessagesAsync(string resourceGroupName, string name, string entityName, RelayServiceConnectionEntity connectionEnvelope, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -46116,6 +45509,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (entityName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "entityName");
+            }
+            if (connectionEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "connectionEnvelope");
+            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -46124,7 +45525,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -46134,22 +45538,24 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
+                tracingParameters.Add("entityName", entityName);
+                tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "UpdateRelayServiceConnectionSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/hybridconnection/{entityName}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{entityName}", System.Uri.EscapeDataString(entityName));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -46158,7 +45564,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("PATCH");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -46189,6 +45595,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(connectionEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(connectionEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -46239,7 +45651,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
+            var _result = new AzureOperationResponse<RelayServiceConnectionEntity>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -46252,7 +45664,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<RelayServiceConnectionEntity>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -46272,23 +45684,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get the status of the last MSDeploy operation.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Get the status of the last MSDeploy operation.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
+        /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of web app slot. If not specified then will default to production
-        /// slot.
-        /// </param>
-        /// <param name='instanceId'>
-        /// ID of web app instance.
+        /// Name of the deployment slot. If a slot is not specified, the API gets the
+        /// production slot instances.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -46311,7 +45720,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -46340,15 +45749,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
             }
-            if (instanceId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "instanceId");
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -46359,23 +45767,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMsDeployStatusSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/extensions/MSDeploy").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
-            _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -46465,7 +45870,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<MSDeployStatus>();
+            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -46478,7 +45883,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MSDeployStatus>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -46498,58 +45903,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Invoke the MSDeploy web app extension.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of web app slot. If not specified then will default to production
-        /// slot.
+        /// Name of the app.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of web app instance.
-        /// </param>
-        /// <param name='mSDeploy'>
-        /// Details of MSDeploy operation
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<MSDeployStatus>> CreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, MSDeploy mSDeploy, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send Request
-            AzureOperationResponse<MSDeployStatus> _response = await BeginCreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(resourceGroupName, name, slot, instanceId, mSDeploy, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
-        /// </summary>
-        /// <remarks>
-        /// Get the MSDeploy Log for the last MSDeploy operation.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of web app.
         /// </param>
         /// <param name='slot'>
-        /// Name of web app slot. If not specified then will default to production
-        /// slot.
-        /// </param>
-        /// <param name='instanceId'>
-        /// ID of web app instance.
+        /// Name of the deployment slot. If a slot is not specified, the API gets the
+        /// production slot instances.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -46557,7 +45926,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -46572,7 +45941,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<MSDeployLog>> GetInstanceMSDeployLogSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<WebSiteInstanceStatus>> GetInstanceInfoSlotWithHttpMessagesAsync(string resourceGroupName, string name, string instanceId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -46597,19 +45966,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (slot == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
-            }
             if (instanceId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "instanceId");
             }
+            if (slot == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -46619,24 +45991,23 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("slot", slot);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMSDeployLogSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceInfoSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/extensions/MSDeploy/log").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
+            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -46696,16 +46067,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -46715,10 +46085,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -46731,7 +46097,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<MSDeployLog>();
+            var _result = new AzureOperationResponse<WebSiteInstanceStatus>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -46744,7 +46110,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MSDeployLog>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<WebSiteInstanceStatus>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -46764,26 +46130,23 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Get the status of the last MSDeploy operation.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get the status of the last MSDeploy operation.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Site name.
+        /// Name of web app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API returns
-        /// deployments for the production slot.
+        /// Name of web app slot. If not specified then will default to production
+        /// slot.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET api/sites/{siteName}/instances".
+        /// ID of web app instance.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -46791,7 +46154,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -46806,7 +46169,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<MSDeployStatus>> GetInstanceMsDeployStatusSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -46843,7 +46206,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -46855,22 +46221,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMsDeployStatusSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/extensions/MSDeploy").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -46930,16 +46295,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -46949,10 +46313,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -46965,7 +46325,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
+            var _result = new AzureOperationResponse<MSDeployStatus>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -46978,7 +46338,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MSDeployStatus>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -46998,29 +46358,58 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Site name.
+        /// Name of web app.
         /// </param>
-        /// <param name='processId'>
-        /// PID.
+        /// <param name='slot'>
+        /// Name of web app slot. If not specified then will default to production
+        /// slot.
+        /// </param>
+        /// <param name='instanceId'>
+        /// ID of web app instance.
+        /// </param>
+        /// <param name='mSDeploy'>
+        /// Details of MSDeploy operation
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<MSDeployStatus>> CreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, MSDeploy mSDeploy, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<MSDeployStatus> _response = await BeginCreateInstanceMSDeployOperationSlotWithHttpMessagesAsync(resourceGroupName, name, slot, instanceId, mSDeploy, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Get the MSDeploy Log for the last MSDeploy operation.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get the MSDeploy Log for the last MSDeploy operation.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API returns
-        /// deployments for the production slot.
+        /// Name of web app slot. If not specified then will default to production
+        /// slot.
         /// </param>
         /// <param name='instanceId'>
-        /// ID of a specific scaled-out instance. This is the value of the name
-        /// property in the JSON response from "GET api/sites/{siteName}/instances".
+        /// ID of web app instance.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -47028,7 +46417,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -47043,7 +46432,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessInfo>> GetInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<MSDeployLog>> GetInstanceMSDeployLogSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -47068,10 +46457,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -47084,7 +46469,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -47094,26 +46482,23 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceMSDeployLogSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/extensions/MSDeploy/log").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -47175,14 +46560,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -47192,10 +46576,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -47208,7 +46588,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessInfo>();
+            var _result = new AzureOperationResponse<MSDeployLog>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -47221,7 +46601,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<MSDeployLog>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -47241,12 +46621,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
+        /// Get list of processes for a web site, or a deployment slot, or for a
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
-        /// specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -47254,9 +46634,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Site name.
         /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
         /// deployments for the production slot.
@@ -47271,9 +46648,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -47283,7 +46663,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> DeleteInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -47308,10 +46688,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -47324,7 +46700,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -47334,26 +46713,23 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "DeleteInstanceProcessSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -47362,7 +46738,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("DELETE");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -47413,16 +46789,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -47432,10 +46807,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -47448,13 +46819,31 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -47463,12 +46852,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get a memory dump of a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Get process information by its ID for a specific scaled-out instance in a
+        /// web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -47493,7 +46882,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -47508,7 +46897,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Stream>> GetInstanceProcessDumpSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ProcessInfo>> GetInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -47549,7 +46938,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -47562,13 +46954,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessDumpSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/dump").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
@@ -47576,9 +46967,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -47630,7 +47021,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -47640,14 +47031,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -47657,10 +47047,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -47673,7 +47059,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Stream>();
+            var _result = new AzureOperationResponse<ProcessInfo>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -47683,7 +47069,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Deserialize Response
             if ((int)_statusCode == 200)
             {
-                _result.Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessInfo>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
             }
             if (_shouldTrace)
             {
@@ -47693,12 +47092,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Terminate a process by its ID for a web site, or a deployment slot, or
+        /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -47723,12 +47122,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -47738,7 +47134,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> DeleteInstanceProcessSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -47779,7 +47175,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -47792,13 +47191,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "DeleteInstanceProcessSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
@@ -47806,9 +47204,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -47817,7 +47215,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("DELETE");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -47868,16 +47266,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -47887,10 +47284,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -47903,31 +47296,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -47936,12 +47311,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Get a memory dump of a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get a memory dump of a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -47952,9 +47327,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='baseAddress'>
-        /// Module base address.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
         /// deployments for the production slot.
@@ -47969,7 +47341,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -47984,7 +47356,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessModuleInfo>> GetInstanceProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Stream>> GetInstanceProcessDumpSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -48013,10 +47385,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "processId");
             }
-            if (baseAddress == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "baseAddress");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -48029,7 +47397,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -48040,27 +47411,24 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("baseAddress", baseAddress);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessModuleSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessDumpSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules/{baseAddress}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/dump").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{baseAddress}", System.Uri.EscapeDataString(baseAddress));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -48112,7 +47480,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -48122,14 +47490,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -48139,10 +47506,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -48155,7 +47518,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessModuleInfo>();
+            var _result = new AzureOperationResponse<Stream>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -48165,20 +47528,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Deserialize Response
             if ((int)_statusCode == 200)
             {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessModuleInfo>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
+                _result.Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
             }
             if (_shouldTrace)
             {
@@ -48188,12 +47538,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// List module information for a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -48218,7 +47568,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -48233,7 +47583,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -48274,7 +47624,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -48287,13 +47640,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/threads").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
@@ -48301,9 +47653,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -48365,14 +47717,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -48382,10 +47733,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -48398,7 +47745,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
+            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -48411,7 +47758,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -48431,12 +47778,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
+        /// Get process information by its ID for a specific scaled-out instance in a
+        /// web site.
         /// </summary>
         /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -48447,8 +47794,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
+        /// <param name='baseAddress'>
+        /// Module base address.
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
@@ -48464,7 +47811,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -48479,7 +47826,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessThreadInfo>> GetInstanceProcessThreadSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ProcessModuleInfo>> GetInstanceProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -48508,9 +47855,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "processId");
             }
-            if (threadId == null)
+            if (baseAddress == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "threadId");
+                throw new ValidationException(ValidationRules.CannotBeNull, "baseAddress");
             }
             if (slot == null)
             {
@@ -48524,7 +47871,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -48535,27 +47885,26 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("threadId", threadId);
+                tracingParameters.Add("baseAddress", baseAddress);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessThreadSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetInstanceProcessModuleSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/threads/{threadId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/modules/{baseAddress}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{threadId}", System.Uri.EscapeDataString(threadId));
+            _url = _url.Replace("{baseAddress}", System.Uri.EscapeDataString(baseAddress));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -48617,14 +47966,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -48634,10 +47982,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -48650,7 +47994,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessThreadInfo>();
+            var _result = new AzureOperationResponse<ProcessModuleInfo>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -48663,7 +48007,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessThreadInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessModuleInfo>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -48683,22 +48027,29 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// List the threads in a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Shows whether an app can be cloned to another resource group or
-        /// subscription.
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
+        /// Site name.
+        /// </param>
+        /// <param name='processId'>
+        /// PID.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. By default, this API returns information on
-        /// the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API returns
+        /// deployments for the production slot.
+        /// </param>
+        /// <param name='instanceId'>
+        /// ID of a specific scaled-out instance. This is the value of the name
+        /// property in the JSON response from "GET api/sites/{siteName}/instances".
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -48721,7 +48072,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteCloneability>> IsCloneableSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, string instanceId, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -48746,15 +48097,26 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (processId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
+            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
             }
+            if (instanceId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "instanceId");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -48764,22 +48126,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
+                tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("instanceId", instanceId);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "IsCloneableSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/iscloneable").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/instances/{instanceId}/processes/{processId}/threads").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
+            _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -48788,7 +48153,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("GET");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -48839,7 +48204,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -48869,7 +48234,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteCloneability>();
+            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -48882,7 +48247,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteCloneability>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -48902,10 +48267,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// This is to allow calling via powershell and ARM template.
+        /// Shows whether an app can be cloned to another resource group or
+        /// subscription.
         /// </summary>
         /// <remarks>
-        /// This is to allow calling via powershell and ARM template.
+        /// Description for Shows whether an app can be cloned to another resource
+        /// group or subscription.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -48914,8 +48281,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API will
-        /// restore a backup of the production slot.
+        /// Name of the deployment slot. By default, this API returns information on
+        /// the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -48938,7 +48305,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteCloneability>> IsCloneableSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -48971,7 +48338,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -48982,21 +48352,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSyncFunctionTriggersSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "IsCloneableSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/listsyncfunctiontriggerstatus").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/iscloneable").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -49086,7 +48455,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<FunctionSecrets>();
+            var _result = new AzureOperationResponse<SiteCloneability>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -49099,7 +48468,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<FunctionSecrets>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteCloneability>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -49119,10 +48488,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -49132,7 +48501,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API will get
-        /// metric definitions of the production slot.
+        /// backups of the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -49155,7 +48524,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -49188,7 +48557,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -49199,21 +48571,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefinitionsSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSiteBackupsSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metricdefinitions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/listbackups").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -49222,7 +48593,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -49303,7 +48674,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -49316,7 +48687,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -49336,10 +48707,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// This is to allow calling via powershell and ARM template.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// Description for This is to allow calling via powershell and ARM template.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -49348,18 +48719,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API will get
-        /// metrics of the production slot.
-        /// </param>
-        /// <param name='details'>
-        /// Specify "true" to include metric details in the response. It is "false" by
-        /// default.
-        /// </param>
-        /// <param name='filter'>
-        /// Return only metrics specified in the filter (using OData syntax). For
-        /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-        /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-        /// timeGrain eq duration'[Hour|Minute|Day]'.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -49382,7 +48742,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, bool? details = default(bool?), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<FunctionSecrets>> ListSyncFunctionTriggersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -49415,7 +48775,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -49426,31 +48789,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("details", details);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricsSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSyncFunctionTriggersSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/metrics").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/listsyncfunctiontriggerstatus").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (details != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("details={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(details, Client.SerializationSettings).Trim('"'))));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -49459,7 +48811,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -49540,7 +48892,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<FunctionSecrets>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -49553,7 +48905,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<FunctionSecrets>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -49577,8 +48929,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// or not MySql in app is enabled
         /// </summary>
         /// <remarks>
-        /// Returns the status of MySql in app migration, if one is active, and whether
-        /// or not MySql in app is enabled
+        /// Description for Returns the status of MySql in app migration, if one is
+        /// active, and whether or not MySql in app is enabled
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -49643,7 +48995,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -49654,7 +49009,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetMigrateMySqlStatusSlot", tracingParameters);
             }
@@ -49666,9 +49020,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -49794,7 +49148,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a Swift Virtual Network connection.
         /// </summary>
         /// <remarks>
-        /// Gets a Swift Virtual Network connection.
+        /// Description for Gets a Swift Virtual Network connection.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -49860,7 +49214,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -49871,7 +49228,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSwiftVirtualNetworkConnectionSlot", tracingParameters);
             }
@@ -49883,9 +49239,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -50014,9 +49370,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in use by another App Service Plan other than the one this App is in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that 1)
-        /// "swiftSupported" is true when doing a GET against this resource, and 2)
-        /// that the target Subnet has already been delegated, and is not
+        /// Description for Integrates this Web App with a Virtual Network. This
+        /// requires that 1) "swiftSupported" is true when doing a GET against this
+        /// resource, and 2) that the target Subnet has already been delegated, and is
+        /// not
         /// in use by another App Service Plan other than the one this App is in.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -50090,7 +49447,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -50102,7 +49462,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateSwiftVirtualNetworkConnectionSlot", tracingParameters);
             }
@@ -50114,9 +49473,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -50249,8 +49608,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot).
         /// </summary>
         /// <remarks>
-        /// Deletes a Swift Virtual Network connection from an app (or deployment
-        /// slot).
+        /// Description for Deletes a Swift Virtual Network connection from an app (or
+        /// deployment slot).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -50268,7 +49627,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -50313,7 +49672,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -50324,7 +49686,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSwiftVirtualNetworkSlot", tracingParameters);
             }
@@ -50336,9 +49697,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -50400,14 +49761,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -50417,10 +49777,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -50454,9 +49810,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in use by another App Service Plan other than the one this App is in.
         /// </summary>
         /// <remarks>
-        /// Integrates this Web App with a Virtual Network. This requires that 1)
-        /// "swiftSupported" is true when doing a GET against this resource, and 2)
-        /// that the target Subnet has already been delegated, and is not
+        /// Description for Integrates this Web App with a Virtual Network. This
+        /// requires that 1) "swiftSupported" is true when doing a GET against this
+        /// resource, and 2) that the target Subnet has already been delegated, and is
+        /// not
         /// in use by another App Service Plan other than the one this App is in.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -50530,7 +49887,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -50542,7 +49902,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSwiftVirtualNetworkConnectionSlot", tracingParameters);
             }
@@ -50554,9 +49913,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -50689,8 +50048,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets all network features used by the app (or deployment slot, if
-        /// specified).
+        /// Description for Gets all network features used by the app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -50711,7 +50070,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -50763,7 +50122,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -50775,7 +50137,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("view", view);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListNetworkFeaturesSlot", tracingParameters);
             }
@@ -50788,9 +50149,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -50852,14 +50213,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -50869,10 +50229,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -50922,8 +50278,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -50996,7 +50352,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -51008,7 +50367,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperationSlot", tracingParameters);
             }
@@ -51021,9 +50379,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -51167,7 +50525,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start capturing network packets for the site (To be deprecated).
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site (To be deprecated).
+        /// Description for Start capturing network packets for the site (To be
+        /// deprecated).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -51241,7 +50600,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -51255,7 +50617,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("maxFrameLength", maxFrameLength);
                 tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StartWebSiteNetworkTraceSlot", tracingParameters);
             }
@@ -51279,9 +50640,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -51407,7 +50768,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -51444,7 +50805,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -51461,7 +50822,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -51506,7 +50867,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -51517,7 +50881,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopWebSiteNetworkTraceSlot", tracingParameters);
             }
@@ -51529,9 +50892,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -51593,14 +50956,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -51610,10 +50972,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -51645,8 +51003,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -51719,7 +51077,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -51731,7 +51092,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTracesSlot", tracingParameters);
             }
@@ -51744,9 +51104,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -51873,8 +51233,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -51947,7 +51307,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -51959,7 +51322,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTraceOperationSlotV2", tracingParameters);
             }
@@ -51972,9 +51334,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -52119,8 +51481,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// if specified).
         /// </summary>
         /// <remarks>
-        /// Gets a named operation for a network trace capturing (or deployment slot,
-        /// if specified).
+        /// Description for Gets a named operation for a network trace capturing (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -52193,7 +51555,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -52205,7 +51570,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("operationId", operationId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetNetworkTracesSlotV2", tracingParameters);
             }
@@ -52218,9 +51582,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -52347,8 +51711,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Generates a new publishing password for an app (or deployment slot, if
-        /// specified).
+        /// Description for Generates a new publishing password for an app (or
+        /// deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -52366,7 +51730,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -52411,7 +51775,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -52422,7 +51789,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GenerateNewSitePublishingPasswordSlot", tracingParameters);
             }
@@ -52434,9 +51800,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -52498,14 +51864,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -52515,10 +51880,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -52549,7 +51910,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -52588,7 +51949,231 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (slot == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("slot", slot);
+                tracingParameters.Add("filter", filter);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersSlot", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/perfcounters").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", filter));
+            }
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Gets web app's event logs.
+        /// </summary>
+        /// <remarks>
+        /// Description for Gets web app's event logs.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of web app.
+        /// </param>
+        /// <param name='slot'>
+        /// Name of web app slot. If not specified then will default to production
+        /// slot.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<SitePhpErrorLogFlag>> GetSitePhpErrorLogFlagSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -52621,229 +52206,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("slot", slot);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersSlot", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/perfcounters").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", filter));
-            }
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
+            if (Client.ApiVersion == null)
             {
-                ServiceClientTracing.Exit(_invocationId, _result);
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            return _result;
-        }
-
-        /// <summary>
-        /// Gets web app's event logs.
-        /// </summary>
-        /// <remarks>
-        /// Gets web app's event logs.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Name of web app.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of web app slot. If not specified then will default to production
-        /// slot.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<SitePhpErrorLogFlag>> GetSitePhpErrorLogFlagSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (slot == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -52854,7 +52220,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSitePhpErrorLogFlagSlot", tracingParameters);
             }
@@ -52866,9 +52231,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -52994,7 +52359,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the premier add-ons of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the premier add-ons of an app.
+        /// Description for Gets the premier add-ons of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -53060,7 +52425,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -53071,7 +52439,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPremierAddOnsSlot", tracingParameters);
             }
@@ -53083,9 +52450,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -53211,7 +52578,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a named add-on of an app.
+        /// Description for Gets a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -53284,7 +52651,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -53296,7 +52666,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPremierAddOnSlot", tracingParameters);
             }
@@ -53309,9 +52678,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -53437,7 +52806,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -53521,7 +52890,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -53534,7 +52906,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("premierAddOn", premierAddOn);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "AddPremierAddOnSlot", tracingParameters);
             }
@@ -53547,9 +52918,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -53681,7 +53052,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a premier add-on from an app.
         /// </summary>
         /// <remarks>
-        /// Delete a premier add-on from an app.
+        /// Description for Delete a premier add-on from an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -53702,7 +53073,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -53751,7 +53122,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -53763,7 +53137,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeletePremierAddOnSlot", tracingParameters);
             }
@@ -53776,9 +53149,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -53840,14 +53213,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -53857,10 +53229,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -53891,7 +53259,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates a named add-on of an app.
         /// </summary>
         /// <remarks>
-        /// Updates a named add-on of an app.
+        /// Description for Updates a named add-on of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -53971,7 +53339,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -53984,7 +53355,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("premierAddOnName", premierAddOnName);
                 tracingParameters.Add("premierAddOn", premierAddOn);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdatePremierAddOnSlot", tracingParameters);
             }
@@ -53997,9 +53367,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -54132,8 +53502,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Gets data around private site access enablement and authorized Virtual
-        /// Networks that can access the site.
+        /// Description for Gets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -54198,7 +53568,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -54209,7 +53582,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPrivateAccessSlot", tracingParameters);
             }
@@ -54221,9 +53593,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -54350,8 +53722,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Networks that can access the site.
         /// </summary>
         /// <remarks>
-        /// Sets data around private site access enablement and authorized Virtual
-        /// Networks that can access the site.
+        /// Description for Sets data around private site access enablement and
+        /// authorized Virtual Networks that can access the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -54423,7 +53795,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -54435,7 +53810,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("access", access);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "PutPrivateAccessVnetSlot", tracingParameters);
             }
@@ -54447,9 +53821,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -54582,8 +53956,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -54601,7 +53975,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -54649,7 +54023,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -54660,7 +54037,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListProcessesSlot", tracingParameters);
             }
@@ -54672,9 +54048,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -54736,14 +54112,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -54753,10 +54128,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -54806,8 +54177,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -54828,7 +54199,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -54880,7 +54251,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -54892,7 +54266,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetProcessSlot", tracingParameters);
             }
@@ -54905,9 +54278,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -54969,14 +54342,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -54986,10 +54358,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -55039,8 +54407,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Terminate a process by its ID for a web site, or a deployment slot, or
-        /// specific scaled-out instance in a web site.
+        /// Description for Terminate a process by its ID for a web site, or a
+        /// deployment slot, or specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -55061,7 +54429,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -55110,7 +54478,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -55122,7 +54493,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteProcessSlot", tracingParameters);
             }
@@ -55135,9 +54505,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -55199,14 +54569,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -55216,10 +54585,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -55251,8 +54616,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get a memory dump of a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get a memory dump of a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -55273,7 +54638,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -55325,227 +54690,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("processId", processId);
-                tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetProcessDumpSlot", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/dump").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
+            if (Client.ApiVersion == null)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<Stream>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _result.Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// Site name.
-        /// </param>
-        /// <param name='processId'>
-        /// PID.
-        /// </param>
-        /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API returns
-        /// deployments for the production slot.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (processId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "processId");
-            }
-            if (slot == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -55557,22 +54705,21 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessModulesSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetProcessDumpSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/dump").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -55624,7 +54771,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
             }
             cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, System.Net.Http.HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
             if (_shouldTrace)
             {
                 ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
@@ -55634,14 +54781,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -55651,10 +54797,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -55667,7 +54809,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
+            var _result = new AzureOperationResponse<Stream>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -55677,20 +54819,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Deserialize Response
             if ((int)_statusCode == 200)
             {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
+                _result.Body = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
             }
             if (_shouldTrace)
             {
@@ -55700,12 +54829,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// List module information for a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get process information by its ID for a specific scaled-out instance in a
-        /// web site.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -55716,9 +54845,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='baseAddress'>
-        /// Module base address.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
         /// deployments for the production slot.
@@ -55729,7 +54855,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -55744,7 +54870,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessModuleInfo>> GetProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListProcessModulesSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -55773,10 +54899,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "processId");
             }
-            if (baseAddress == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "baseAddress");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -55785,7 +54907,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -55796,25 +54921,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("baseAddress", baseAddress);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetProcessModuleSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessModulesSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules/{baseAddress}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{baseAddress}", System.Uri.EscapeDataString(baseAddress));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -55876,14 +54998,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -55893,10 +55014,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -55909,7 +55026,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessModuleInfo>();
+            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -55922,7 +55039,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessModuleInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -55942,12 +55059,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Get process information by its ID for a specific scaled-out instance in a
+        /// web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get process information by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -55958,6 +55075,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='processId'>
         /// PID.
         /// </param>
+        /// <param name='baseAddress'>
+        /// Module base address.
+        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
         /// deployments for the production slot.
@@ -55968,7 +55088,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -55983,7 +55103,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ProcessModuleInfo>> GetProcessModuleSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string baseAddress, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -56012,6 +55132,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "processId");
             }
+            if (baseAddress == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "baseAddress");
+            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -56020,7 +55144,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -56031,23 +55158,24 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
+                tracingParameters.Add("baseAddress", baseAddress);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessThreadsSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetProcessModuleSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/threads").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/modules/{baseAddress}").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
+            _url = _url.Replace("{baseAddress}", System.Uri.EscapeDataString(baseAddress));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -56109,14 +55237,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -56126,10 +55253,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -56142,7 +55265,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
+            var _result = new AzureOperationResponse<ProcessModuleInfo>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -56155,7 +55278,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessModuleInfo>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -56175,11 +55298,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get thread information by Thread ID for a specific process, in a specific
-        /// scaled-out instance in a web site.
+        /// List the threads in a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get thread information by Thread ID for a specific process, in a specific
+        /// Description for List the threads in a process by its ID for a specific
         /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='resourceGroupName'>
@@ -56191,9 +55314,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='processId'>
         /// PID.
         /// </param>
-        /// <param name='threadId'>
-        /// TID.
-        /// </param>
         /// <param name='slot'>
         /// Name of the deployment slot. If a slot is not specified, the API returns
         /// deployments for the production slot.
@@ -56204,7 +55324,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -56219,7 +55339,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProcessThreadInfo>> GetProcessThreadSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string threadId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsSlotWithHttpMessagesAsync(string resourceGroupName, string name, string processId, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -56248,10 +55368,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "processId");
             }
-            if (threadId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "threadId");
-            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -56260,7 +55376,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -56271,25 +55390,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("processId", processId);
-                tracingParameters.Add("threadId", threadId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetProcessThreadSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessThreadsSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/threads/{threadId}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/processes/{processId}/threads").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{processId}", System.Uri.EscapeDataString(processId));
-            _url = _url.Replace("{threadId}", System.Uri.EscapeDataString(threadId));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -56351,14 +55467,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -56368,10 +55483,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -56384,7 +55495,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProcessThreadInfo>();
+            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -56397,7 +55508,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProcessThreadInfo>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -56420,7 +55531,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -56486,7 +55597,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -56497,7 +55611,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPublicCertificatesSlot", tracingParameters);
             }
@@ -56509,9 +55622,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -56638,8 +55751,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Get the named public certificate for an app (or deployment slot, if
-        /// specified).
+        /// Description for Get the named public certificate for an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -56712,7 +55825,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -56724,7 +55840,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPublicCertificateSlot", tracingParameters);
             }
@@ -56737,9 +55852,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{publicCertificateName}", System.Uri.EscapeDataString(publicCertificateName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -56865,7 +55980,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Creates a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Creates a hostname binding for an app.
+        /// Description for Creates a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -56946,7 +56061,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -56959,7 +56077,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
                 tracingParameters.Add("publicCertificate", publicCertificate);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdatePublicCertificateSlot", tracingParameters);
             }
@@ -56972,9 +56089,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -57106,7 +56223,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes a hostname binding for an app.
         /// </summary>
         /// <remarks>
-        /// Deletes a hostname binding for an app.
+        /// Description for Deletes a hostname binding for an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -57127,7 +56244,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -57176,7 +56293,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -57188,7 +56308,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("publicCertificateName", publicCertificateName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeletePublicCertificateSlot", tracingParameters);
             }
@@ -57201,9 +56320,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{publicCertificateName}", System.Uri.EscapeDataString(publicCertificateName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -57265,14 +56384,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -57282,10 +56400,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -57316,7 +56430,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the publishing profile for an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Gets the publishing profile for an app (or deployment slot, if specified).
+        /// Description for Gets the publishing profile for an app (or deployment slot,
+        /// if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -57390,7 +56505,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -57402,7 +56520,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("publishingProfileOptions", publishingProfileOptions);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPublishingProfileXmlWithSecretsSlot", tracingParameters);
             }
@@ -57414,9 +56531,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -57536,8 +56653,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// previously modified by calling the API with POST.
         /// </summary>
         /// <remarks>
-        /// Resets the configuration settings of the current slot if they were
-        /// previously modified by calling the API with POST.
+        /// Description for Resets the configuration settings of the current slot if
+        /// they were previously modified by calling the API with POST.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -57555,7 +56672,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -57600,7 +56717,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -57611,7 +56731,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ResetSlotConfigurationSlot", tracingParameters);
             }
@@ -57623,9 +56742,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -57687,14 +56806,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -57704,10 +56822,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -57738,7 +56852,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restarts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Restarts an app (or deployment slot, if specified).
+        /// Description for Restarts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -57764,7 +56878,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -57809,7 +56923,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -57822,7 +56939,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("softRestart", softRestart);
                 tracingParameters.Add("synchronous", synchronous);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RestartSlot", tracingParameters);
             }
@@ -57842,9 +56958,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("synchronous={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(synchronous, Client.SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -57906,14 +57022,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -57923,10 +57038,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -57957,7 +57068,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -57989,7 +57100,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58021,7 +57132,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58054,7 +57165,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58063,8 +57175,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Site name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -58072,7 +57184,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -58120,7 +57232,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -58131,7 +57246,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteExtensionsSlot", tracingParameters);
             }
@@ -58143,9 +57257,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -58207,14 +57321,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -58224,10 +57337,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -58277,8 +57386,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Get site extension information by its ID for a web site, or a deployment
-        /// slot.
+        /// Description for Get site extension information by its ID for a web site, or
+        /// a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58290,8 +57399,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Site extension name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -58299,7 +57408,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -58351,7 +57460,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -58363,7 +57475,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSiteExtensionSlot", tracingParameters);
             }
@@ -58376,9 +57487,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -58440,14 +57551,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -58457,10 +57567,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -58509,7 +57615,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58521,8 +57627,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Site extension name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -58541,7 +57647,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Remove a site extension from a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Remove a site extension from a web site, or a deployment slot.
+        /// Description for Remove a site extension from a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58562,7 +57669,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -58611,7 +57718,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -58623,7 +57733,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSiteExtensionSlot", tracingParameters);
             }
@@ -58636,9 +57745,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -58700,14 +57809,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -58717,10 +57825,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -58748,10 +57852,45 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get the difference in configuration settings between two web app slots.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot of an
+        /// app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config properties
+        /// to override the source slot config. See example.
+        /// </param>
+        /// <param name='slot'>
+        /// Name of the source slot. If a slot is not specified, the production slot is
+        /// used as the source slot.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse> CopySlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse _response = await BeginCopySlotSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, slot, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
         /// Get the difference in configuration settings between two web app slots.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get the difference in configuration settings between two
+        /// web app slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -58828,7 +57967,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -58840,7 +57982,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slotSwapEntity", slotSwapEntity);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSlotDifferencesSlot", tracingParameters);
             }
@@ -58852,9 +57993,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -58986,7 +58127,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59018,7 +58159,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59083,7 +58224,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -59094,7 +58238,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSnapshotsSlot", tracingParameters);
             }
@@ -59106,9 +58249,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -59234,7 +58377,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59299,7 +58443,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -59310,7 +58457,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSnapshotsFromDRSecondarySlot", tracingParameters);
             }
@@ -59322,9 +58468,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -59450,7 +58596,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the source control configuration of an app.
+        /// Description for Gets the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59516,7 +58662,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -59527,7 +58676,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSourceControlSlot", tracingParameters);
             }
@@ -59539,9 +58687,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -59703,7 +58851,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59735,7 +58883,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the source control configuration of an app.
+        /// Description for Deletes the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -59753,7 +58901,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -59798,7 +58946,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -59809,7 +58960,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSourceControlSlot", tracingParameters);
             }
@@ -59821,9 +58971,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -59885,14 +59035,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -59902,10 +59051,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -59936,7 +59081,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60009,7 +59154,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -60021,7 +59169,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteSourceControl", siteSourceControl);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSourceControlSlot", tracingParameters);
             }
@@ -60033,9 +59180,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -60203,7 +59350,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Starts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Starts an app (or deployment slot, if specified).
+        /// Description for Starts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60221,7 +59368,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -60266,7 +59413,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -60277,7 +59427,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StartSlot", tracingParameters);
             }
@@ -60289,9 +59438,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -60353,14 +59502,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -60370,10 +59518,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -60404,7 +59548,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60441,7 +59585,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stops an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Stops an app (or deployment slot, if specified).
+        /// Description for Stops an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60459,7 +59603,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -60504,7 +59648,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -60515,7 +59662,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopSlot", tracingParameters);
             }
@@ -60527,9 +59673,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -60591,14 +59737,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -60608,10 +59753,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -60642,7 +59783,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60659,7 +59800,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -60704,7 +59845,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -60715,7 +59859,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopNetworkTraceSlot", tracingParameters);
             }
@@ -60727,9 +59870,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -60791,14 +59934,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -60808,10 +59950,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -60842,7 +59980,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Sync web app repository.
         /// </summary>
         /// <remarks>
-        /// Sync web app repository.
+        /// Description for Sync web app repository.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -60860,7 +59998,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -60905,7 +60043,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -60916,7 +60057,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "SyncRepositorySlot", tracingParameters);
             }
@@ -60928,9 +60068,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -60992,14 +60132,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -61009,10 +60148,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -61043,7 +60178,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Syncs function trigger metadata to the scale controller
         /// </summary>
         /// <remarks>
-        /// Syncs function trigger metadata to the scale controller
+        /// Description for Syncs function trigger metadata to the scale controller
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -61052,8 +60187,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of the app.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API will
-        /// restore a backup of the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -61061,7 +60195,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -61106,7 +60240,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -61117,7 +60254,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "SyncFunctionTriggersSlot", tracingParameters);
             }
@@ -61129,9 +60265,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -61193,14 +60329,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -61210,10 +60345,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -61244,7 +60375,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -61310,7 +60441,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -61321,7 +60455,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListTriggeredWebJobsSlot", tracingParameters);
             }
@@ -61333,9 +60466,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -61461,7 +60594,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a triggered web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job by its ID for an app, or a deployment slot.
+        /// Description for Gets a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -61473,8 +60607,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of Web Job.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -61482,7 +60616,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -61534,7 +60668,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -61546,7 +60683,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetTriggeredWebJobSlot", tracingParameters);
             }
@@ -61559,9 +60695,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -61623,14 +60759,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -61640,10 +60775,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -61692,7 +60823,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a triggered web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a triggered web job by its ID for an app, or a deployment slot.
+        /// Description for Delete a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -61704,8 +60836,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of Web Job.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API deletes
+        /// web job for the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -61713,7 +60845,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -61762,7 +60894,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -61774,7 +60909,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteTriggeredWebJobSlot", tracingParameters);
             }
@@ -61787,9 +60921,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -61851,14 +60985,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -61868,10 +61001,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -61902,7 +61031,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List a triggered web job's history for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -61914,8 +61044,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of Web Job.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -61923,7 +61053,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -61975,7 +61105,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -61987,7 +61120,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListTriggeredWebJobHistorySlot", tracingParameters);
             }
@@ -62000,9 +61132,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -62064,14 +61196,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -62081,10 +61212,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -62134,8 +61261,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job's history by its ID for an app, , or a deployment
-        /// slot.
+        /// Description for Gets a triggered web job's history by its ID for an app, ,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -62150,8 +61277,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// History ID.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -62159,7 +61286,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -62215,7 +61342,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -62228,7 +61358,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("id", id);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetTriggeredWebJobHistorySlot", tracingParameters);
             }
@@ -62242,9 +61371,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -62306,14 +61435,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -62323,10 +61451,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -62375,7 +61499,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Run a triggered web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Run a triggered web job for an app, or a deployment slot.
+        /// Description for Run a triggered web job for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -62387,8 +61511,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Name of Web Job.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -62396,7 +61520,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -62445,7 +61569,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -62457,7 +61584,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RunTriggeredWebJobSlot", tracingParameters);
             }
@@ -62470,9 +61596,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -62534,14 +61660,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -62551,10 +61676,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -62586,8 +61707,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -62659,7 +61780,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -62671,7 +61795,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListUsagesSlot", tracingParameters);
             }
@@ -62687,9 +61810,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -62815,7 +61938,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the virtual networks the app (or deployment slot) is connected to.
         /// </summary>
         /// <remarks>
-        /// Gets the virtual networks the app (or deployment slot) is connected to.
+        /// Description for Gets the virtual networks the app (or deployment slot) is
+        /// connected to.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -62881,7 +62005,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -62892,7 +62019,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListVnetConnectionsSlot", tracingParameters);
             }
@@ -62904,9 +62030,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -63033,8 +62159,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// name.
         /// </summary>
         /// <remarks>
-        /// Gets a virtual network the app (or deployment slot) is connected to by
-        /// name.
+        /// Description for Gets a virtual network the app (or deployment slot) is
+        /// connected to by name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -63107,7 +62233,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -63119,7 +62248,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetVnetConnectionSlot", tracingParameters);
             }
@@ -63132,9 +62260,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -63261,8 +62389,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-        /// connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+        /// or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -63342,7 +62470,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -63355,7 +62486,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetConnectionSlot", tracingParameters);
             }
@@ -63368,9 +62498,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -63503,8 +62633,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// network.
         /// </summary>
         /// <remarks>
-        /// Deletes a connection from an app (or deployment slot to a named virtual
-        /// network.
+        /// Description for Deletes a connection from an app (or deployment slot to a
+        /// named virtual network.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -63525,7 +62655,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -63574,7 +62704,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -63586,7 +62719,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteVnetConnectionSlot", tracingParameters);
             }
@@ -63599,9 +62731,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -63663,14 +62795,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -63680,10 +62811,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -63715,8 +62842,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-        /// connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+        /// or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -63796,7 +62923,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -63809,7 +62939,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetConnectionSlot", tracingParameters);
             }
@@ -63822,9 +62951,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -63956,7 +63085,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets an app's Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Gets an app's Virtual Network gateway.
+        /// Description for Gets an app's Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -63980,7 +63109,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -64036,7 +63165,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -64049,7 +63181,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetVnetConnectionGatewaySlot", tracingParameters);
             }
@@ -64063,9 +63194,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -64127,14 +63258,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -64144,10 +63274,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -64196,7 +63322,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+        /// updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -64287,7 +63414,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -64301,7 +63431,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetConnectionGatewaySlot", tracingParameters);
             }
@@ -64315,9 +63444,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -64449,7 +63578,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+        /// updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -64536,7 +63666,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -64550,7 +63683,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetConnectionGatewaySlot", tracingParameters);
             }
@@ -64564,9 +63696,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -64698,7 +63830,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -64764,7 +63896,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -64775,7 +63910,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListWebJobsSlot", tracingParameters);
             }
@@ -64787,9 +63921,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -64915,7 +64049,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get webjob information for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get webjob information for an app, or a deployment slot.
+        /// Description for Get webjob information for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -64988,7 +64122,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -65000,7 +64137,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetWebJobSlot", tracingParameters);
             }
@@ -65013,9 +64149,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -65141,7 +64277,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the difference in configuration settings between two web app slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app slots.
+        /// Description for Get the difference in configuration settings between two
+        /// web app slots.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -65210,7 +64347,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -65221,7 +64361,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slotSwapEntity", slotSwapEntity);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSlotDifferencesFromProduction", tracingParameters);
             }
@@ -65232,9 +64371,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -65366,7 +64505,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -65394,7 +64533,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -65452,7 +64591,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -65462,7 +64604,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSnapshots", tracingParameters);
             }
@@ -65473,9 +64614,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -65601,7 +64742,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -65659,7 +64801,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -65669,7 +64814,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSnapshotsFromDRSecondary", tracingParameters);
             }
@@ -65680,9 +64824,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -65808,7 +64952,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the source control configuration of an app.
+        /// Description for Gets the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -65866,7 +65010,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -65876,7 +65023,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSourceControl", tracingParameters);
             }
@@ -65887,9 +65033,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -66051,7 +65197,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66079,7 +65225,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Deletes the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Deletes the source control configuration of an app.
+        /// Description for Deletes the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66093,7 +65239,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -66134,7 +65280,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -66144,7 +65293,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteSourceControl", tracingParameters);
             }
@@ -66155,9 +65303,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -66219,14 +65367,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -66236,10 +65383,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -66270,7 +65413,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66335,7 +65478,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -66346,7 +65492,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteSourceControl", siteSourceControl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSourceControl", tracingParameters);
             }
@@ -66357,9 +65502,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -66527,7 +65672,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Starts an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Starts an app (or deployment slot, if specified).
+        /// Description for Starts an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66541,7 +65686,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -66582,7 +65727,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -66592,7 +65740,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Start", tracingParameters);
             }
@@ -66603,9 +65750,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -66667,14 +65814,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -66684,10 +65830,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -66718,7 +65860,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66752,7 +65894,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stops an app (or deployment slot, if specified).
         /// </summary>
         /// <remarks>
-        /// Stops an app (or deployment slot, if specified).
+        /// Description for Stops an app (or deployment slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66766,7 +65908,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -66807,7 +65949,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -66817,7 +65962,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Stop", tracingParameters);
             }
@@ -66828,9 +65972,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -66892,14 +66036,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -66909,10 +66052,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -66943,7 +66082,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Stop ongoing capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Stop ongoing capturing network packets for the site.
+        /// Description for Stop ongoing capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -66957,7 +66096,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -66998,7 +66137,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -67008,7 +66150,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "StopNetworkTrace", tracingParameters);
             }
@@ -67019,9 +66160,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -67083,14 +66224,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -67100,10 +66240,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -67134,7 +66270,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Sync web app repository.
         /// </summary>
         /// <remarks>
-        /// Sync web app repository.
+        /// Description for Sync web app repository.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -67148,7 +66284,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -67189,7 +66325,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -67199,7 +66338,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "SyncRepository", tracingParameters);
             }
@@ -67210,9 +66348,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -67274,14 +66412,13 @@ internal WebAppsOperations(WebSiteManagementClient 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 DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -67291,10 +66428,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -67325,7 +66458,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Syncs function trigger metadata to the scale controller
         /// </summary>
         /// <remarks>
-        /// Syncs function trigger metadata to the scale controller
+        /// Description for Syncs function trigger metadata to the scale controller
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -67339,7 +66472,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -67380,7 +66513,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -67390,7 +66526,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "SyncFunctionTriggers", tracingParameters);
             }
@@ -67401,9 +66536,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -67465,14 +66600,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -67482,10 +66616,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -67516,7 +66646,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -67574,7 +66704,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -67584,7 +66717,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListTriggeredWebJobs", tracingParameters);
             }
@@ -67595,9 +66727,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -67723,7 +66855,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets a triggered web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job by its ID for an app, or a deployment slot.
+        /// Description for Gets a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -67740,7 +66873,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -67788,7 +66921,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -67799,7 +66935,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetTriggeredWebJob", tracingParameters);
             }
@@ -67811,9 +66946,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -67875,14 +67010,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -67892,10 +67026,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -67944,7 +67074,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Delete a triggered web job by its ID for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Delete a triggered web job by its ID for an app, or a deployment slot.
+        /// Description for Delete a triggered web job by its ID for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -67961,7 +67092,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -68006,7 +67137,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -68017,7 +67151,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteTriggeredWebJob", tracingParameters);
             }
@@ -68029,9 +67162,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -68093,14 +67226,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -68110,10 +67242,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -68144,7 +67272,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List a triggered web job's history for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -68161,7 +67290,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -68209,7 +67338,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -68220,7 +67352,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListTriggeredWebJobHistory", tracingParameters);
             }
@@ -68232,9 +67363,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -68296,14 +67427,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -68313,10 +67443,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -68366,8 +67492,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// slot.
         /// </summary>
         /// <remarks>
-        /// Gets a triggered web job's history by its ID for an app, , or a deployment
-        /// slot.
+        /// Description for Gets a triggered web job's history by its ID for an app, ,
+        /// or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -68387,7 +67513,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -68439,7 +67565,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -68451,7 +67580,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
                 tracingParameters.Add("id", id);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetTriggeredWebJobHistory", tracingParameters);
             }
@@ -68464,9 +67592,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{id}", System.Uri.EscapeDataString(id));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -68528,14 +67656,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -68545,10 +67672,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -68597,7 +67720,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Run a triggered web job for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Run a triggered web job for an app, or a deployment slot.
+        /// Description for Run a triggered web job for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -68614,7 +67737,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -68659,7 +67782,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -68670,7 +67796,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "RunTriggeredWebJob", tracingParameters);
             }
@@ -68682,9 +67807,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -68746,14 +67871,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -68763,10 +67887,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -68798,8 +67918,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -68863,7 +67983,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -68874,7 +67997,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListUsages", tracingParameters);
             }
@@ -68889,9 +68011,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("$filter={0}", filter));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -69017,7 +68139,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the virtual networks the app (or deployment slot) is connected to.
         /// </summary>
         /// <remarks>
-        /// Gets the virtual networks the app (or deployment slot) is connected to.
+        /// Description for Gets the virtual networks the app (or deployment slot) is
+        /// connected to.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -69075,7 +68198,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -69085,7 +68211,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListVnetConnections", tracingParameters);
             }
@@ -69096,9 +68221,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -69225,8 +68350,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// name.
         /// </summary>
         /// <remarks>
-        /// Gets a virtual network the app (or deployment slot) is connected to by
-        /// name.
+        /// Description for Gets a virtual network the app (or deployment slot) is
+        /// connected to by name.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -69291,7 +68416,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -69302,7 +68430,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetVnetConnection", tracingParameters);
             }
@@ -69314,9 +68441,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -69443,8 +68570,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-        /// connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+        /// or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -69516,7 +68643,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -69528,7 +68658,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetConnection", tracingParameters);
             }
@@ -69540,9 +68669,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -69675,8 +68804,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// network.
         /// </summary>
         /// <remarks>
-        /// Deletes a connection from an app (or deployment slot to a named virtual
-        /// network.
+        /// Description for Deletes a connection from an app (or deployment slot to a
+        /// named virtual network.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -69693,7 +68822,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -69738,7 +68867,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -69749,7 +68881,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "DeleteVnetConnection", tracingParameters);
             }
@@ -69761,9 +68892,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -69825,14 +68956,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -69842,10 +68972,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -69877,8 +69003,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// connection properties (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-        /// connection properties (PATCH).
+        /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+        /// or updates the connection properties (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -69950,7 +69076,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -69962,7 +69091,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetConnection", tracingParameters);
             }
@@ -69974,9 +69102,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{vnetName}", System.Uri.EscapeDataString(vnetName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -70108,7 +69236,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets an app's Virtual Network gateway.
         /// </summary>
         /// <remarks>
-        /// Gets an app's Virtual Network gateway.
+        /// Description for Gets an app's Virtual Network gateway.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -70128,7 +69256,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -70180,7 +69308,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -70192,7 +69323,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("gatewayName", gatewayName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetVnetConnectionGateway", tracingParameters);
             }
@@ -70205,9 +69335,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -70269,14 +69399,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -70286,10 +69415,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -70338,7 +69463,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+        /// updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -70421,7 +69547,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -70434,7 +69563,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CreateOrUpdateVnetConnectionGateway", tracingParameters);
             }
@@ -70447,9 +69575,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -70581,7 +69709,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
         /// </summary>
         /// <remarks>
-        /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+        /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+        /// updates it (PATCH).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -70660,7 +69789,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -70673,7 +69805,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("vnetName", vnetName);
                 tracingParameters.Add("gatewayName", gatewayName);
                 tracingParameters.Add("connectionEnvelope", connectionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateVnetConnectionGateway", tracingParameters);
             }
@@ -70686,9 +69817,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{gatewayName}", System.Uri.EscapeDataString(gatewayName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -70820,7 +69951,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -70878,7 +70009,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -70888,7 +70022,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListWebJobs", tracingParameters);
             }
@@ -70899,9 +70032,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -71027,7 +70160,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get webjob information for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get webjob information for an app, or a deployment slot.
+        /// Description for Get webjob information for an app, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -71092,7 +70225,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -71103,7 +70239,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("webJobName", webJobName);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetWebJob", tracingParameters);
             }
@@ -71115,9 +70250,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{webJobName}", System.Uri.EscapeDataString(webJobName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -71244,8 +70379,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// updates an existing app.
         /// </summary>
         /// <remarks>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -71315,7 +70450,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -71326,7 +70464,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteEnvelope", siteEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters);
             }
@@ -71337,9 +70474,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -71490,8 +70627,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -71511,7 +70648,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -71564,7 +70701,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -71576,7 +70716,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestore", tracingParameters);
             }
@@ -71588,9 +70727,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{backupId}", System.Uri.EscapeDataString(backupId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -71658,14 +70797,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -71675,10 +70813,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -71709,7 +70843,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -71767,7 +70901,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -71777,7 +70914,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginListPublishingCredentials", tracingParameters);
             }
@@ -71788,9 +70924,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -71916,7 +71052,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -71933,7 +71069,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -71981,7 +71117,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -71992,7 +71131,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("mSDeploy", mSDeploy);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateMSDeployOperation", tracingParameters);
             }
@@ -72003,9 +71141,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -72073,14 +71211,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 201 && (int)_statusCode != 409)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -72090,10 +71227,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -72142,7 +71275,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -72214,7 +71347,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -72226,7 +71362,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("functionName", functionName);
                 tracingParameters.Add("functionEnvelope", functionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateFunction", tracingParameters);
             }
@@ -72238,9 +71373,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{functionName}", System.Uri.EscapeDataString(functionName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -72372,7 +71507,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -72392,7 +71527,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -72444,7 +71579,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -72456,7 +71594,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("instanceId", instanceId);
                 tracingParameters.Add("mSDeploy", mSDeploy);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateInstanceMSDeployOperation", tracingParameters);
             }
@@ -72468,9 +71605,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -72538,14 +71675,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 201 && (int)_statusCode != 409)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -72555,10 +71691,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -72607,7 +71739,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a web app.
         /// </summary>
         /// <remarks>
-        /// Restores a web app.
+        /// Description for Restores a web app.
         /// </remarks>
         /// <param name='subscriptionName'>
         /// Azure subscription.
@@ -72683,7 +71815,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -72695,7 +71830,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("migrationOptions", migrationOptions);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginMigrateStorage", tracingParameters);
             }
@@ -72710,9 +71844,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("subscriptionName={0}", System.Uri.EscapeDataString(subscriptionName)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -72844,7 +71978,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Migrates a local (in-app) MySql database to a remote MySql database.
         /// </summary>
         /// <remarks>
-        /// Migrates a local (in-app) MySql database to a remote MySql database.
+        /// Description for Migrates a local (in-app) MySql database to a remote MySql
+        /// database.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -72876,7 +72011,240 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Operation>> BeginMigrateMySqlWithHttpMessagesAsync(string resourceGroupName, string name, MigrateMySqlRequest migrationRequestEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Operation>> BeginMigrateMySqlWithHttpMessagesAsync(string resourceGroupName, string name, MigrateMySqlRequest migrationRequestEnvelope, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (migrationRequestEnvelope == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "migrationRequestEnvelope");
+            }
+            if (migrationRequestEnvelope != null)
+            {
+                migrationRequestEnvelope.Validate();
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("migrationRequestEnvelope", migrationRequestEnvelope);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginMigrateMySql", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migratemysql").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            if(migrationRequestEnvelope != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(migrationRequestEnvelope, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<Operation>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Operation>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Start capturing network packets for the site.
+        /// </summary>
+        /// <remarks>
+        /// Description for Start capturing network packets for the site.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// The name of the web app.
+        /// </param>
+        /// <param name='durationInSeconds'>
+        /// The duration to keep capturing in seconds.
+        /// </param>
+        /// <param name='maxFrameLength'>
+        /// The maximum frame length in bytes (Optional).
+        /// </param>
+        /// <param name='sasUrl'>
+        /// The Blob URL to store capture file.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartWebSiteNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -72901,242 +72269,14 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (migrationRequestEnvelope == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "migrationRequestEnvelope");
-            }
-            if (migrationRequestEnvelope != null)
-            {
-                migrationRequestEnvelope.Validate();
-            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("name", name);
-                tracingParameters.Add("migrationRequestEnvelope", migrationRequestEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginMigrateMySql", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/migratemysql").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(migrationRequestEnvelope != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(migrationRequestEnvelope, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<Operation>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
+            if (Client.ApiVersion == null)
             {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Operation>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            return _result;
-        }
-
-        /// <summary>
-        /// Start capturing network packets for the site.
-        /// </summary>
-        /// <remarks>
-        /// Start capturing network packets for the site.
-        /// </remarks>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='durationInSeconds'>
-        /// The duration to keep capturing in seconds.
-        /// </param>
-        /// <param name='maxFrameLength'>
-        /// The maximum frame length in bytes (Optional).
-        /// </param>
-        /// <param name='sasUrl'>
-        /// The Blob URL to store capture file.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartWebSiteNetworkTraceOperationWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (name == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "name");
-            }
-            if (Client.SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
-            }
-            string apiVersion = "2018-11-01";
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -73149,7 +72289,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("durationInSeconds", durationInSeconds);
                 tracingParameters.Add("maxFrameLength", maxFrameLength);
                 tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginStartWebSiteNetworkTraceOperation", tracingParameters);
             }
@@ -73172,9 +72311,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -73318,7 +72457,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -73335,7 +72474,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -73384,7 +72523,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -73395,7 +72537,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreFromBackupBlob", tracingParameters);
             }
@@ -73406,9 +72547,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -73476,14 +72617,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -73493,10 +72633,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -73527,7 +72663,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -73544,7 +72680,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -73589,7 +72725,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -73600,7 +72739,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("restoreRequest", restoreRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreFromDeletedApp", tracingParameters);
             }
@@ -73611,9 +72749,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -73681,14 +72819,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -73698,10 +72835,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -73732,7 +72865,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -73750,7 +72883,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -73799,7 +72932,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -73810,7 +72946,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("restoreRequest", restoreRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreSnapshot", tracingParameters);
             }
@@ -73821,9 +72956,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -73891,14 +73026,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -73908,10 +73042,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -73942,7 +73072,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -73959,7 +73089,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -74007,7 +73137,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -74018,7 +73151,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginInstallSiteExtension", tracingParameters);
             }
@@ -74030,9 +73162,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{siteExtensionId}", System.Uri.EscapeDataString(siteExtensionId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -74094,14 +73226,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 429)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -74111,10 +73242,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -74178,12 +73305,220 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Creates a new web, mobile, or API app in an existing resource group, or
-        /// updates an existing app.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
+        /// Description for Copies a deployment slot to another deployment slot of an
+        /// app.
+        /// </remarks>
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// Name of the app.
+        /// </param>
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config properties
+        /// to override the source slot config. See example.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse> BeginCopyProductionSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (resourceGroupName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (copySlotEntity == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "copySlotEntity");
+            }
+            if (copySlotEntity != null)
+            {
+                copySlotEntity.Validate();
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("copySlotEntity", copySlotEntity);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCopyProductionSlot", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotcopy").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+                }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            if(copySlotEntity != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(copySlotEntity, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
+                if (_shouldTrace)
+                {
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
         /// Creates a new web, mobile, or API app in an existing resource group, or
         /// updates an existing app.
+        /// </summary>
+        /// <remarks>
+        /// Description for Creates a new web, mobile, or API app in an existing
+        /// resource group, or updates an existing app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74261,7 +73596,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -74273,7 +73611,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteEnvelope", siteEnvelope);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateSlot", tracingParameters);
             }
@@ -74285,9 +73622,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -74438,8 +73775,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Restores a specific backup to another app (or deployment slot, if
-        /// specified).
+        /// Description for Restores a specific backup to another app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74463,7 +73800,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -74520,7 +73857,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -74533,7 +73873,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("backupId", backupId);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreSlot", tracingParameters);
             }
@@ -74546,9 +73885,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -74616,14 +73955,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -74633,10 +73971,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -74667,7 +74001,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Gets the Git/FTP publishing credentials of an app.
         /// </summary>
         /// <remarks>
-        /// Gets the Git/FTP publishing credentials of an app.
+        /// Description for Gets the Git/FTP publishing credentials of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74733,7 +74067,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -74744,7 +74081,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginListPublishingCredentialsSlot", tracingParameters);
             }
@@ -74756,9 +74092,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -74884,7 +74220,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -74905,7 +74241,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -74957,7 +74293,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -74969,7 +74308,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("mSDeploy", mSDeploy);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateMSDeployOperationSlot", tracingParameters);
             }
@@ -74981,9 +74319,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -75051,14 +74389,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 201 && (int)_statusCode != 409)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -75068,10 +74405,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -75120,7 +74453,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Create function for web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Create function for web site, or a deployment slot.
+        /// Description for Create function for web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -75132,8 +74465,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Function name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot.
         /// </param>
         /// <param name='functionEnvelope'>
         /// Function details.
@@ -75200,7 +74532,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -75213,7 +74548,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("functionName", functionName);
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("functionEnvelope", functionEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateInstanceFunctionSlot", tracingParameters);
             }
@@ -75226,9 +74560,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -75360,7 +74694,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Invoke the MSDeploy web app extension.
         /// </summary>
         /// <remarks>
-        /// Invoke the MSDeploy web app extension.
+        /// Description for Invoke the MSDeploy web app extension.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -75384,7 +74718,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -75440,7 +74774,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -75453,7 +74790,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("instanceId", instanceId);
                 tracingParameters.Add("mSDeploy", mSDeploy);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginCreateInstanceMSDeployOperationSlot", tracingParameters);
             }
@@ -75466,9 +74802,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{instanceId}", System.Uri.EscapeDataString(instanceId));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -75536,14 +74872,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 201 && (int)_statusCode != 409)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -75553,10 +74888,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -75605,7 +74936,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -75679,7 +75010,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -75693,7 +75027,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("slot", slot);
                 tracingParameters.Add("maxFrameLength", maxFrameLength);
                 tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginStartWebSiteNetworkTraceOperationSlot", tracingParameters);
             }
@@ -75717,9 +75050,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
             }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -75863,7 +75196,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores an app from a backup blob in Azure Storage.
         /// </summary>
         /// <remarks>
-        /// Restores an app from a backup blob in Azure Storage.
+        /// Description for Restores an app from a backup blob in Azure Storage.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -75884,7 +75217,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -75937,7 +75270,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -75949,7 +75285,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreFromBackupBlobSlot", tracingParameters);
             }
@@ -75961,9 +75296,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -76031,14 +75366,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -76048,10 +75382,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -76082,7 +75412,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a deleted web app to this web app.
         /// </summary>
         /// <remarks>
-        /// Restores a deleted web app to this web app.
+        /// Description for Restores a deleted web app to this web app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -76103,7 +75433,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -76152,7 +75482,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -76164,7 +75497,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("restoreRequest", restoreRequest);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreFromDeletedAppSlot", tracingParameters);
             }
@@ -76176,9 +75508,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -76246,14 +75578,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -76263,10 +75594,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -76297,7 +75624,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Restores a web app from a snapshot.
         /// </summary>
         /// <remarks>
-        /// Restores a web app from a snapshot.
+        /// Description for Restores a web app from a snapshot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -76319,7 +75646,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -76372,7 +75699,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -76384,7 +75714,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("restoreRequest", restoreRequest);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginRestoreSnapshotSlot", tracingParameters);
             }
@@ -76396,9 +75725,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -76466,14 +75795,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -76483,10 +75811,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -76517,7 +75841,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Install site extension on a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Install site extension on a web site, or a deployment slot.
+        /// Description for Install site extension on a web site, or a deployment slot.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -76529,8 +75853,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Site extension name.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API deletes a
-        /// deployment for the production slot.
+        /// Name of the deployment slot. If a slot is not specified, the API uses the
+        /// production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -76538,7 +75862,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -76590,7 +75914,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -76602,7 +75929,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 tracingParameters.Add("name", name);
                 tracingParameters.Add("siteExtensionId", siteExtensionId);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "BeginInstallSiteExtensionSlot", tracingParameters);
             }
@@ -76615,9 +75941,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -76679,14 +76005,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 429)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -76696,10 +76021,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -76763,10 +76084,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Swaps two deployment slots of an app.
+        /// Copies a deployment slot to another deployment slot of an app.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Copies a deployment slot to another deployment slot of an
+        /// app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -76774,8 +76096,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='slotSwapEntity'>
-        /// JSON object that contains the target slot name. See example.
+        /// <param name='copySlotEntity'>
+        /// JSON object that contains the target slot name and site config properties
+        /// to override the source slot config. See example.
         /// </param>
         /// <param name='slot'>
         /// Name of the source slot. If a slot is not specified, the production slot is
@@ -76787,7 +76110,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -76799,7 +76122,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> BeginSwapSlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmSlotEntity slotSwapEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> BeginCopySlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -76824,13 +76147,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (slotSwapEntity == null)
+            if (copySlotEntity == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slotSwapEntity");
+                throw new ValidationException(ValidationRules.CannotBeNull, "copySlotEntity");
             }
-            if (slotSwapEntity != null)
+            if (copySlotEntity != null)
             {
-                slotSwapEntity.Validate();
+                copySlotEntity.Validate();
             }
             if (slot == null)
             {
@@ -76840,7 +76163,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -76850,23 +76176,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("slotSwapEntity", slotSwapEntity);
+                tracingParameters.Add("copySlotEntity", copySlotEntity);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginSwapSlotSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCopySlotSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsswap").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotcopy").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -76906,9 +76231,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(slotSwapEntity != null)
+            if(copySlotEntity != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotSwapEntity, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(copySlotEntity, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -76934,14 +76259,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -76951,10 +76275,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -76982,10 +76302,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Updates the source control configuration of an app.
+        /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -76993,12 +76313,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='siteSourceControl'>
-        /// JSON representation of a SiteSourceControl object. See example.
+        /// <param name='slotSwapEntity'>
+        /// JSON object that contains the target slot name. See example.
         /// </param>
         /// <param name='slot'>
-        /// Name of the deployment slot. If a slot is not specified, the API will
-        /// update the source control configuration for the production slot.
+        /// Name of the source slot. If a slot is not specified, the production slot is
+        /// used as the source slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -77009,9 +76329,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -77021,7 +76338,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteSourceControl>> BeginCreateOrUpdateSourceControlSlotWithHttpMessagesAsync(string resourceGroupName, string name, SiteSourceControl siteSourceControl, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> BeginSwapSlotSlotWithHttpMessagesAsync(string resourceGroupName, string name, CsmSlotEntity slotSwapEntity, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -77046,9 +76363,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (siteSourceControl == null)
+            if (slotSwapEntity == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "siteSourceControl");
+                throw new ValidationException(ValidationRules.CannotBeNull, "slotSwapEntity");
+            }
+            if (slotSwapEntity != null)
+            {
+                slotSwapEntity.Validate();
             }
             if (slot == null)
             {
@@ -77058,7 +76379,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -77068,23 +76392,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("siteSourceControl", siteSourceControl);
+                tracingParameters.Add("slotSwapEntity", slotSwapEntity);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateSourceControlSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginSwapSlotSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/slotsswap").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -77093,7 +76416,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -77124,9 +76447,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(siteSourceControl != null)
+            if(slotSwapEntity != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteSourceControl, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotSwapEntity, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -77150,7 +76473,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -77180,67 +76503,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteSourceControl>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 201)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -77249,28 +76518,23 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Start capturing network packets for the site.
+        /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='slot'>
-        /// The name of the slot for this web app.
-        /// </param>
-        /// <param name='durationInSeconds'>
-        /// The duration to keep capturing in seconds.
+        /// Name of the app.
         /// </param>
-        /// <param name='maxFrameLength'>
-        /// The maximum frame length in bytes (Optional).
+        /// <param name='siteSourceControl'>
+        /// JSON representation of a SiteSourceControl object. See example.
         /// </param>
-        /// <param name='sasUrl'>
-        /// The Blob URL to store capture file.
+        /// <param name='slot'>
+        /// Name of the deployment slot. If a slot is not specified, the API will
+        /// update the source control configuration for the production slot.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -77293,7 +76557,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartNetworkTraceSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteSourceControl>> BeginCreateOrUpdateSourceControlSlotWithHttpMessagesAsync(string resourceGroupName, string name, SiteSourceControl siteSourceControl, string slot, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -77318,6 +76582,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (siteSourceControl == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "siteSourceControl");
+            }
             if (slot == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "slot");
@@ -77326,7 +76594,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -77336,37 +76607,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("durationInSeconds", durationInSeconds);
+                tracingParameters.Add("siteSourceControl", siteSourceControl);
                 tracingParameters.Add("slot", slot);
-                tracingParameters.Add("maxFrameLength", maxFrameLength);
-                tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginStartNetworkTraceSlot", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateSourceControlSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/startNetworkTrace").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/sourcecontrols/web").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (durationInSeconds != null)
-            {
-                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
-            }
-            if (maxFrameLength != null)
-            {
-                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
-            }
-            if (sasUrl != null)
-            {
-                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -77375,7 +76631,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -77406,6 +76662,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(siteSourceControl != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteSourceControl, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -77426,7 +76688,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -77456,7 +76718,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
+            var _result = new AzureOperationResponse<SiteSourceControl>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -77469,7 +76731,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -77487,7 +76767,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -77507,19 +76787,28 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Swaps two deployment slots of an app.
+        /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Swaps two deployment slots of an app.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// Name of the app.
+        /// The name of the web app.
         /// </param>
-        /// <param name='slotSwapEntity'>
-        /// JSON object that contains the target slot name. See example.
+        /// <param name='slot'>
+        /// The name of the slot for this web app.
+        /// </param>
+        /// <param name='durationInSeconds'>
+        /// The duration to keep capturing in seconds.
+        /// </param>
+        /// <param name='maxFrameLength'>
+        /// The maximum frame length in bytes (Optional).
+        /// </param>
+        /// <param name='sasUrl'>
+        /// The Blob URL to store capture file.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -77527,9 +76816,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -77539,7 +76831,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> BeginSwapSlotWithProductionWithHttpMessagesAsync(string resourceGroupName, string name, CsmSlotEntity slotSwapEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartNetworkTraceSlotWithHttpMessagesAsync(string resourceGroupName, string name, string slot, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -77564,19 +76856,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (slotSwapEntity == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "slotSwapEntity");
-            }
-            if (slotSwapEntity != null)
+            if (slot == null)
             {
-                slotSwapEntity.Validate();
+                throw new ValidationException(ValidationRules.CannotBeNull, "slot");
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -77586,21 +76877,36 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("slotSwapEntity", slotSwapEntity);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("durationInSeconds", durationInSeconds);
+                tracingParameters.Add("slot", slot);
+                tracingParameters.Add("maxFrameLength", maxFrameLength);
+                tracingParameters.Add("sasUrl", sasUrl);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginSwapSlotWithProduction", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginStartNetworkTraceSlot", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotsswap").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slots/{slot}/startNetworkTrace").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{slot}", System.Uri.EscapeDataString(slot));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (durationInSeconds != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
+            }
+            if (maxFrameLength != null)
+            {
+                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
+            }
+            if (sasUrl != null)
+            {
+                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
+            }
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -77640,12 +76946,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(slotSwapEntity != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotSwapEntity, Client.SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -77668,14 +76968,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -77685,10 +76984,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -77701,13 +76996,49 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -77716,10 +77047,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Updates the source control configuration of an app.
+        /// Swaps two deployment slots of an app.
         /// </summary>
         /// <remarks>
-        /// Updates the source control configuration of an app.
+        /// Description for Swaps two deployment slots of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -77727,8 +77058,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='name'>
         /// Name of the app.
         /// </param>
-        /// <param name='siteSourceControl'>
-        /// JSON representation of a SiteSourceControl object. See example.
+        /// <param name='slotSwapEntity'>
+        /// JSON object that contains the target slot name. See example.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -77739,9 +77070,6 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
         /// <exception cref="ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
@@ -77751,7 +77079,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<SiteSourceControl>> BeginCreateOrUpdateSourceControlWithHttpMessagesAsync(string resourceGroupName, string name, SiteSourceControl siteSourceControl, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse> BeginSwapSlotWithProductionWithHttpMessagesAsync(string resourceGroupName, string name, CsmSlotEntity slotSwapEntity, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -77776,15 +77104,22 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
-            if (siteSourceControl == null)
+            if (slotSwapEntity == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "siteSourceControl");
+                throw new ValidationException(ValidationRules.CannotBeNull, "slotSwapEntity");
+            }
+            if (slotSwapEntity != null)
+            {
+                slotSwapEntity.Validate();
             }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -77794,21 +77129,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("siteSourceControl", siteSourceControl);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("slotSwapEntity", slotSwapEntity);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateSourceControl", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginSwapSlotWithProduction", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/slotsswap").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -77817,7 +77151,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("PUT");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -77848,9 +77182,9 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(siteSourceControl != null)
+            if(slotSwapEntity != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteSourceControl, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(slotSwapEntity, Client.SerializationSettings);
                 _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
                 _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
             }
@@ -77874,7 +77208,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -77904,67 +77238,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<SiteSourceControl>();
+            var _result = new AzureOperationResponse();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
             {
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 201)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -77973,25 +77253,19 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Start capturing network packets for the site.
+        /// Updates the source control configuration of an app.
         /// </summary>
         /// <remarks>
-        /// Start capturing network packets for the site.
+        /// Description for Updates the source control configuration of an app.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
         /// </param>
         /// <param name='name'>
-        /// The name of the web app.
-        /// </param>
-        /// <param name='durationInSeconds'>
-        /// The duration to keep capturing in seconds.
-        /// </param>
-        /// <param name='maxFrameLength'>
-        /// The maximum frame length in bytes (Optional).
+        /// Name of the app.
         /// </param>
-        /// <param name='sasUrl'>
-        /// The Blob URL to store capture file.
+        /// <param name='siteSourceControl'>
+        /// JSON representation of a SiteSourceControl object. See example.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -78014,7 +77288,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<SiteSourceControl>> BeginCreateOrUpdateSourceControlWithHttpMessagesAsync(string resourceGroupName, string name, SiteSourceControl siteSourceControl, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (resourceGroupName == null)
             {
@@ -78039,11 +77313,18 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
             }
+            if (siteSourceControl == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "siteSourceControl");
+            }
             if (Client.SubscriptionId == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            string apiVersion = "2018-11-01";
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -78053,35 +77334,20 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("name", name);
-                tracingParameters.Add("durationInSeconds", durationInSeconds);
-                tracingParameters.Add("maxFrameLength", maxFrameLength);
-                tracingParameters.Add("sasUrl", sasUrl);
-                tracingParameters.Add("apiVersion", apiVersion);
+                tracingParameters.Add("siteSourceControl", siteSourceControl);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginStartNetworkTrace", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdateSourceControl", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/startNetworkTrace").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/sourcecontrols/web").ToString();
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (durationInSeconds != null)
-            {
-                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
-            }
-            if (maxFrameLength != null)
-            {
-                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
-            }
-            if (sasUrl != null)
-            {
-                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
-            }
-            if (apiVersion != null)
+            if (Client.ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -78090,7 +77356,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
+            _httpRequest.Method = new HttpMethod("PUT");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -78121,6 +77387,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(siteSourceControl != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(siteSourceControl, Client.SerializationSettings);
+                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
+                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
+            }
             // Set Credentials
             if (Client.Credentials != null)
             {
@@ -78141,7 +77413,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200 && (int)_statusCode != 201 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -78171,7 +77443,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
+            var _result = new AzureOperationResponse<SiteSourceControl>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -78184,7 +77456,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 201)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -78202,7 +77492,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<SiteSourceControl>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -78222,13 +77512,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get all apps for a subscription.
+        /// Start capturing network packets for the site.
         /// </summary>
         /// <remarks>
-        /// Get all apps for a subscription.
+        /// Description for Start capturing network packets for the site.
         /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='resourceGroupName'>
+        /// Name of the resource group to which the resource belongs.
+        /// </param>
+        /// <param name='name'>
+        /// The name of the web app.
+        /// </param>
+        /// <param name='durationInSeconds'>
+        /// The duration to keep capturing in seconds.
+        /// </param>
+        /// <param name='maxFrameLength'>
+        /// The maximum frame length in bytes (Optional).
+        /// </param>
+        /// <param name='sasUrl'>
+        /// The Blob URL to store capture file.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -78251,11 +77553,38 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IList<NetworkTrace>>> BeginStartNetworkTraceWithHttpMessagesAsync(string resourceGroupName, string name, int? durationInSeconds = default(int?), int? maxFrameLength = default(int?), string sasUrl = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (nextPageLink == null)
+            if (resourceGroupName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
+                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
+            }
+            if (resourceGroupName != null)
+            {
+                if (resourceGroupName.Length > 90)
+                {
+                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
+                }
+                if (resourceGroupName.Length < 1)
+                {
+                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
+                }
+                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
+                {
+                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
+                }
+            }
+            if (name == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "name");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -78264,14 +77593,37 @@ internal WebAppsOperations(WebSiteManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
+                tracingParameters.Add("resourceGroupName", resourceGroupName);
+                tracingParameters.Add("name", name);
+                tracingParameters.Add("durationInSeconds", durationInSeconds);
+                tracingParameters.Add("maxFrameLength", maxFrameLength);
+                tracingParameters.Add("sasUrl", sasUrl);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginStartNetworkTrace", tracingParameters);
             }
             // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/sites/{name}/startNetworkTrace").ToString();
+            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+            _url = _url.Replace("{name}", System.Uri.EscapeDataString(name));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
+            if (durationInSeconds != null)
+            {
+                _queryParameters.Add(string.Format("durationInSeconds={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(durationInSeconds, Client.SerializationSettings).Trim('"'))));
+            }
+            if (maxFrameLength != null)
+            {
+                _queryParameters.Add(string.Format("maxFrameLength={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(maxFrameLength, Client.SerializationSettings).Trim('"'))));
+            }
+            if (sasUrl != null)
+            {
+                _queryParameters.Add(string.Format("sasUrl={0}", System.Uri.EscapeDataString(sasUrl)));
+            }
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -78279,7 +77631,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -78330,7 +77682,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -78360,7 +77712,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
+            var _result = new AzureOperationResponse<IList<NetworkTrace>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -78373,7 +77725,25 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 202)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<NetworkTrace>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -78393,10 +77763,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all web, mobile, and API apps in the specified resource group.
+        /// Get all apps for a subscription.
         /// </summary>
         /// <remarks>
-        /// Gets all web, mobile, and API apps in the specified resource group.
+        /// Description for Get all apps for a subscription.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -78422,7 +77792,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -78437,7 +77807,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -78564,10 +77934,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets existing backups of an app.
+        /// Gets all web, mobile, and API apps in the specified resource group.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Gets all web, mobile, and API apps in the specified
+        /// resource group.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -78593,7 +77964,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListBackupsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListByResourceGroupNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -78608,7 +77979,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListBackupsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByResourceGroupNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -78702,7 +78073,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<BackupItem>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -78715,7 +78086,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -78735,10 +78106,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the configurations of an app
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -78764,7 +78135,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteConfigResource>>> ListConfigurationsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListBackupsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -78779,7 +78150,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListBackupsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -78873,7 +78244,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteConfigResource>>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -78886,7 +78257,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -78906,12 +78277,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -78937,7 +78306,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteConfigResource>>> ListConfigurationsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -78952,7 +78321,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfoNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79046,7 +78415,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
+            var _result = new AzureOperationResponse<IPage<SiteConfigResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79059,7 +78428,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79079,10 +78448,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Gets a list of web app configuration snapshots identifiers. Each element of
+        /// the list contains a timestamp and the ID of the snapshot.
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for Gets a list of web app configuration snapshots identifiers.
+        /// Each element of the list contains a timestamp and the ID of the snapshot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79108,7 +78479,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ContinuousWebJob>>> ListContinuousWebJobsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79123,7 +78494,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfoNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79217,7 +78588,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ContinuousWebJob>>();
+            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79230,7 +78601,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ContinuousWebJob>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79250,10 +78621,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List deployments for an app, or a deployment slot.
+        /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for List continuous web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79279,7 +78650,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Deployment>>> ListDeploymentsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ContinuousWebJob>>> ListContinuousWebJobsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79294,7 +78665,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79388,7 +78759,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Deployment>>();
+            var _result = new AzureOperationResponse<IPage<ContinuousWebJob>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79401,7 +78772,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Deployment>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ContinuousWebJob>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79421,10 +78792,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79450,7 +78821,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Identifier>>> ListDomainOwnershipIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Deployment>>> ListDeploymentsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79465,7 +78836,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiersNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79559,7 +78930,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Identifier>>();
+            var _result = new AzureOperationResponse<IPage<Deployment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79572,7 +78943,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Identifier>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Deployment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79592,10 +78963,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the functions for a web site, or a deployment slot.
+        /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for Lists ownership identifiers for domain associated with web
+        /// app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79606,7 +78978,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -79621,7 +78993,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<FunctionEnvelope>>> ListFunctionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Identifier>>> ListDomainOwnershipIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79636,7 +79008,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListFunctionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiersNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79700,16 +79072,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -79719,10 +79090,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -79735,7 +79102,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<FunctionEnvelope>>();
+            var _result = new AzureOperationResponse<IPage<Identifier>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79748,7 +79115,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<FunctionEnvelope>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Identifier>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79768,10 +79135,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for List the functions for a web site, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79797,7 +79164,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<HostNameBinding>>> ListHostNameBindingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<FunctionEnvelope>>> ListFunctionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79812,7 +79179,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindingsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListFunctionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -79876,7 +79243,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -79906,7 +79273,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<HostNameBinding>>();
+            var _result = new AzureOperationResponse<IPage<FunctionEnvelope>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -79919,7 +79286,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HostNameBinding>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<FunctionEnvelope>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -79939,10 +79306,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all scale-out instances of an app.
+        /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for Get hostname bindings for an app or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -79968,7 +79335,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<HostNameBinding>>> ListHostNameBindingsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -79983,7 +79350,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindingsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -80077,185 +79444,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
+            var _result = new AzureOperationResponse<IPage<HostNameBinding>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -80268,7 +79457,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HostNameBinding>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -80288,12 +79477,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -80304,7 +79491,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -80319,7 +79506,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -80334,7 +79521,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -80398,16 +79585,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -80417,10 +79603,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -80433,7 +79615,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
+            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -80446,7 +79628,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -80466,12 +79648,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Get list of processes for a web site, or a deployment slot, or for a
+        /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -80482,7 +79664,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -80497,7 +79679,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -80512,7 +79694,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -80578,14 +79760,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -80595,10 +79776,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -80611,7 +79788,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
+            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -80624,7 +79801,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -80644,10 +79821,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// List module information for a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -80673,7 +79852,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -80688,7 +79867,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefinitionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -80752,7 +79931,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -80782,7 +79961,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -80795,7 +79974,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -80815,10 +79994,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// List the threads in a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -80844,7 +80025,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -80859,7 +80040,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -80923,7 +80104,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -80953,7 +80134,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -80966,7 +80147,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -80986,10 +80167,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets perfmon counters for web app.
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -81015,7 +80196,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -81030,7 +80211,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSiteBackupsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -81043,7 +80224,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -81124,185 +80305,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
-        /// </summary>
-        /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
-        /// </remarks>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="CloudException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListProcessesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (nextPageLink == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessesNext", tracingParameters);
-            }
-            // Construct URL
-            string _url = "{nextLink}";
-            _url = _url.Replace("{nextLink}", nextPageLink);
-            List<string> _queryParameters = new List<string>();
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (Client.AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            // Set Credentials
-            if (Client.Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
-            {
-                var ex = new CloudException(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);
-                    if (_errorBody != null)
-                    {
-                        ex = new CloudException(_errorBody.Message);
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                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);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -81315,7 +80318,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -81335,12 +80338,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -81351,7 +80352,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -81366,7 +80367,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListProcessModulesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -81381,7 +80382,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessModulesNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -81445,16 +80446,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -81464,10 +80464,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -81480,7 +80476,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
+            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -81493,7 +80489,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -81513,12 +80509,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Get list of processes for a web site, or a deployment slot, or for a
+        /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -81529,7 +80525,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -81544,7 +80540,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListProcessesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -81559,7 +80555,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessThreadsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -81625,14 +80621,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -81642,10 +80637,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -81658,7 +80649,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
+            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -81671,7 +80662,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -81691,10 +80682,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get public certificates for an app or a deployment slot.
+        /// List module information for a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -81720,7 +80713,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PublicCertificate>>> ListPublicCertificatesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListProcessModulesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -81735,7 +80728,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListPublicCertificatesNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessModulesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -81799,7 +80792,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -81829,7 +80822,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PublicCertificate>>();
+            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -81842,7 +80835,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PublicCertificate>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -81862,10 +80855,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// List the threads in a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -81876,7 +80871,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -81891,7 +80886,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteExtensionInfo>>> ListSiteExtensionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListProcessThreadsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -81906,7 +80901,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSiteExtensionsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessThreadsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -81972,14 +80967,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -81989,10 +80983,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -82005,7 +80995,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteExtensionInfo>>();
+            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82018,7 +81008,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteExtensionInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82038,10 +81028,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets an app's deployment slots.
+        /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets an app's deployment slots.
+        /// Description for Get public certificates for an app or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82067,7 +81057,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Site>>> ListSlotsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<PublicCertificate>>> ListPublicCertificatesNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82082,7 +81072,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListSlotsNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListPublicCertificatesNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -82176,7 +81166,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Site>>();
+            var _result = new AzureOperationResponse<IPage<PublicCertificate>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82189,7 +81179,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PublicCertificate>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82209,10 +81199,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets existing backups of an app.
+        /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets existing backups of an app.
+        /// Description for Get list of siteextensions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82238,7 +81229,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListBackupsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteExtensionInfo>>> ListSiteExtensionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82253,7 +81244,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListBackupsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSiteExtensionsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -82317,7 +81308,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -82347,7 +81338,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<BackupItem>>();
+            var _result = new AzureOperationResponse<IPage<SiteExtensionInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82360,7 +81351,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteExtensionInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82380,10 +81371,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the configurations of an app
+        /// Gets an app's deployment slots.
         /// </summary>
         /// <remarks>
-        /// List the configurations of an app
+        /// Description for Gets an app's deployment slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82409,7 +81400,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteConfigResource>>> ListConfigurationsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Site>>> ListSlotsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82424,7 +81415,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSlotsNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -82518,7 +81509,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteConfigResource>>();
+            var _result = new AzureOperationResponse<IPage<Site>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82531,7 +81522,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigResource>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Site>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82551,12 +81542,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets a list of web app configuration snapshots identifiers. Each element of
-        /// the list contains a timestamp and the ID of the snapshot.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82582,7 +81571,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListBackupsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82597,7 +81586,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfoSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListBackupsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -82691,7 +81680,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82704,7 +81693,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82724,10 +81713,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// List the configurations of an app
         /// </summary>
         /// <remarks>
-        /// List continuous web jobs for an app, or a deployment slot.
+        /// Description for List the configurations of an app
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82753,7 +81742,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ContinuousWebJob>>> ListContinuousWebJobsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteConfigResource>>> ListConfigurationsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82768,7 +81757,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -82862,7 +81851,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ContinuousWebJob>>();
+            var _result = new AzureOperationResponse<IPage<SiteConfigResource>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -82875,7 +81864,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ContinuousWebJob>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigResource>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -82895,10 +81884,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List deployments for an app, or a deployment slot.
+        /// Gets a list of web app configuration snapshots identifiers. Each element of
+        /// the list contains a timestamp and the ID of the snapshot.
         /// </summary>
         /// <remarks>
-        /// List deployments for an app, or a deployment slot.
+        /// Description for Gets a list of web app configuration snapshots identifiers.
+        /// Each element of the list contains a timestamp and the ID of the snapshot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -82924,7 +81915,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Deployment>>> ListDeploymentsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>> ListConfigurationSnapshotInfoSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -82939,7 +81930,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationSnapshotInfoSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83033,7 +82024,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Deployment>>();
+            var _result = new AzureOperationResponse<IPage<SiteConfigurationSnapshotInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83046,7 +82037,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Deployment>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteConfigurationSnapshotInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83066,10 +82057,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// List continuous web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Lists ownership identifiers for domain associated with web app.
+        /// Description for List continuous web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83095,7 +82086,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Identifier>>> ListDomainOwnershipIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ContinuousWebJob>>> ListContinuousWebJobsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83110,7 +82101,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiersSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListContinuousWebJobsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83204,7 +82195,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<Identifier>>();
+            var _result = new AzureOperationResponse<IPage<ContinuousWebJob>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83217,7 +82208,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Identifier>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ContinuousWebJob>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83237,10 +82228,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the functions for a web site, or a deployment slot.
+        /// List deployments for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List the functions for a web site, or a deployment slot.
+        /// Description for List deployments for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83251,7 +82242,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -83266,7 +82257,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<FunctionEnvelope>>> ListInstanceFunctionsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Deployment>>> ListDeploymentsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83281,7 +82272,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceFunctionsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListDeploymentsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83345,16 +82336,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -83364,10 +82354,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -83380,7 +82366,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<FunctionEnvelope>>();
+            var _result = new AzureOperationResponse<IPage<Deployment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83393,7 +82379,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<FunctionEnvelope>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Deployment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83413,10 +82399,11 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Lists ownership identifiers for domain associated with web app.
         /// </summary>
         /// <remarks>
-        /// Get hostname bindings for an app or a deployment slot.
+        /// Description for Lists ownership identifiers for domain associated with web
+        /// app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83442,7 +82429,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<HostNameBinding>>> ListHostNameBindingsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Identifier>>> ListDomainOwnershipIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83457,7 +82444,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindingsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListDomainOwnershipIdentifiersSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83551,7 +82538,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<HostNameBinding>>();
+            var _result = new AzureOperationResponse<IPage<Identifier>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83564,7 +82551,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HostNameBinding>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Identifier>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83584,10 +82571,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all scale-out instances of an app.
+        /// List the functions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Gets all scale-out instances of an app.
+        /// Description for List the functions for a web site, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83613,7 +82600,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<FunctionEnvelope>>> ListInstanceFunctionsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83628,7 +82615,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceFunctionsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83692,7 +82679,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -83722,7 +82709,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
+            var _result = new AzureOperationResponse<IPage<FunctionEnvelope>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83735,7 +82722,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<FunctionEnvelope>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83755,12 +82742,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Get hostname bindings for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Get hostname bindings for an app or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83771,7 +82756,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -83786,7 +82771,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<HostNameBinding>>> ListHostNameBindingsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83801,7 +82786,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListHostNameBindingsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -83865,16 +82850,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -83884,10 +82868,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -83900,7 +82880,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
+            var _result = new AzureOperationResponse<IPage<HostNameBinding>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -83913,7 +82893,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<HostNameBinding>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -83933,12 +82913,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Gets all scale-out instances of an app.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for Gets all scale-out instances of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -83949,7 +82927,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -83964,7 +82942,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<SiteInstance>>> ListInstanceIdentifiersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -83979,7 +82957,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceIdentifiersSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84043,16 +83021,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -84062,10 +83039,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -84078,7 +83051,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
+            var _result = new AzureOperationResponse<IPage<SiteInstance>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -84091,7 +83064,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<SiteInstance>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -84111,12 +83084,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Get list of processes for a web site, or a deployment slot, or for a
+        /// specific scaled-out instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84127,7 +83100,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -84142,7 +83115,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListInstanceProcessesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -84157,7 +83130,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessesSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84223,14 +83196,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -84240,10 +83212,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -84256,7 +83224,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
+            var _result = new AzureOperationResponse<IPage<ProcessInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -84269,7 +83237,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -84289,10 +83257,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// List module information for a process by its ID for a specific scaled-out
+        /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// Gets all metric definitions of an app (or deployment slot, if specified).
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84318,7 +83288,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetricDefinition>>> ListMetricDefinitionsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessModuleInfo>>> ListInstanceProcessModulesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -84333,7 +83303,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricDefinitionsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessModulesSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84397,7 +83367,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -84427,7 +83397,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetricDefinition>>();
+            var _result = new AzureOperationResponse<IPage<ProcessModuleInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -84440,7 +83410,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetricDefinition>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessModuleInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -84460,10 +83430,12 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// List the threads in a process by its ID for a specific scaled-out instance
+        /// in a web site.
         /// </summary>
         /// <remarks>
-        /// Gets performance metrics of an app (or deployment slot, if specified).
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84489,7 +83461,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ResourceMetric>>> ListMetricsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<ProcessThreadInfo>>> ListInstanceProcessThreadsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -84504,7 +83476,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListMetricsSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListInstanceProcessThreadsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84568,7 +83540,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
                 var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -84598,7 +83570,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<ResourceMetric>>();
+            var _result = new AzureOperationResponse<IPage<ProcessThreadInfo>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -84611,7 +83583,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ResourceMetric>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<ProcessThreadInfo>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -84631,10 +83603,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Gets perfmon counters for web app.
+        /// Gets existing backups of an app.
         /// </summary>
         /// <remarks>
-        /// Gets perfmon counters for web app.
+        /// Description for Gets existing backups of an app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84660,7 +83632,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BackupItem>>> ListSiteBackupsSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -84675,7 +83647,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListSiteBackupsSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84688,7 +83660,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
             // Create HTTP transport objects
             var _httpRequest = new HttpRequestMessage();
             HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.Method = new HttpMethod("POST");
             _httpRequest.RequestUri = new System.Uri(_url);
             // Set Headers
             if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
@@ -84769,7 +83741,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
+            var _result = new AzureOperationResponse<IPage<BackupItem>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -84782,7 +83754,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BackupItem>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -84802,12 +83774,10 @@ internal WebAppsOperations(WebSiteManagementClient client)
         }
 
         /// <summary>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Gets perfmon counters for web app.
         /// </summary>
         /// <remarks>
-        /// Get list of processes for a web site, or a deployment slot, or for a
-        /// specific scaled-out instance in a web site.
+        /// Description for Gets perfmon counters for web app.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84818,7 +83788,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -84833,7 +83803,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListProcessesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<PerfMonResponse>>> ListPerfMonCountersSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -84848,7 +83818,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListProcessesSlotNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListPerfMonCountersSlotNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
@@ -84912,16 +83882,15 @@ internal WebAppsOperations(WebSiteManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            if ((int)_statusCode != 200)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -84931,10 +83900,179 @@ internal WebAppsOperations(WebSiteManagementClient client)
                 }
                 ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
                 ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_httpResponse.Headers.Contains("x-ms-request-id"))
+                if (_shouldTrace)
                 {
-                    ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+                    ServiceClientTracing.Error(_invocationId, ex);
+                }
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw ex;
+            }
+            // Create Result
+            var _result = new AzureOperationResponse<IPage<PerfMonResponse>>();
+            _result.Request = _httpRequest;
+            _result.Response = _httpResponse;
+            if (_httpResponse.Headers.Contains("x-ms-request-id"))
+            {
+                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+            }
+            // Deserialize Response
+            if ((int)_statusCode == 200)
+            {
+                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                try
+                {
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PerfMonResponse>>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Get list of processes for a web site, or a deployment slot, or for a
+        /// specific scaled-out instance in a web site.
+        /// </summary>
+        /// <remarks>
+        /// Description for Get list of processes for a web site, or a deployment slot,
+        /// or for a specific scaled-out instance in a web site.
+        /// </remarks>
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="DefaultErrorResponseException">
+        /// Thrown when the operation returned an invalid status code
+        /// </exception>
+        /// <exception cref="SerializationException">
+        /// Thrown when unable to deserialize the response
+        /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <return>
+        /// A response object containing the response body and response headers.
+        /// </return>
+        public async Task<AzureOperationResponse<IPage<ProcessInfo>>> ListProcessesSlotNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (nextPageLink == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("nextPageLink", nextPageLink);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "ListProcessesSlotNext", tracingParameters);
+            }
+            // Construct URL
+            string _url = "{nextLink}";
+            _url = _url.Replace("{nextLink}", nextPageLink);
+            List<string> _queryParameters = new List<string>();
+            if (_queryParameters.Count > 0)
+            {
+                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+            }
+            // Create HTTP transport objects
+            var _httpRequest = new HttpRequestMessage();
+            HttpResponseMessage _httpResponse = null;
+            _httpRequest.Method = new HttpMethod("GET");
+            _httpRequest.RequestUri = new System.Uri(_url);
+            // Set Headers
+            if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value)
+            {
+                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+            }
+            if (Client.AcceptLanguage != null)
+            {
+                if (_httpRequest.Headers.Contains("accept-language"))
+                {
+                    _httpRequest.Headers.Remove("accept-language");
+                }
+                _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage);
+            }
+
+
+            if (customHeaders != null)
+            {
+                foreach(var _header in customHeaders)
+                {
+                    if (_httpRequest.Headers.Contains(_header.Key))
+                    {
+                        _httpRequest.Headers.Remove(_header.Key);
+                    }
+                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
                 }
+            }
+
+            // Serialize Request
+            string _requestContent = null;
+            // Set Credentials
+            if (Client.Credentials != null)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+                await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            }
+            // Send Request
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+            }
+            cancellationToken.ThrowIfCancellationRequested();
+            _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+            }
+            HttpStatusCode _statusCode = _httpResponse.StatusCode;
+            cancellationToken.ThrowIfCancellationRequested();
+            string _responseContent = null;
+            if ((int)_statusCode != 200 && (int)_statusCode != 404)
+            {
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
+                    if (_errorBody != null)
+                    {
+                        ex.Body = _errorBody;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // Ignore the exception
+                }
+                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
+                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
                 if (_shouldTrace)
                 {
                     ServiceClientTracing.Error(_invocationId, ex);
@@ -84984,8 +84122,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// instance in a web site.
         /// </summary>
         /// <remarks>
-        /// List module information for a process by its ID for a specific scaled-out
-        /// instance in a web site.
+        /// Description for List module information for a process by its ID for a
+        /// specific scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -84996,7 +84134,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -85092,14 +84230,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -85109,10 +84246,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -85162,8 +84295,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// in a web site.
         /// </summary>
         /// <remarks>
-        /// List the threads in a process by its ID for a specific scaled-out instance
-        /// in a web site.
+        /// Description for List the threads in a process by its ID for a specific
+        /// scaled-out instance in a web site.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -85174,7 +84307,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -85270,14 +84403,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -85287,10 +84419,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -85339,7 +84467,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get public certificates for an app or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get public certificates for an app or a deployment slot.
+        /// Description for Get public certificates for an app or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -85510,7 +84638,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get list of siteextensions for a web site, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// Get list of siteextensions for a web site, or a deployment slot.
+        /// Description for Get list of siteextensions for a web site, or a deployment
+        /// slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -85521,7 +84650,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -85617,14 +84746,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -85634,10 +84762,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -85686,7 +84810,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the difference in configuration settings between two web app slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app slots.
+        /// Description for Get the difference in configuration settings between two
+        /// web app slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -85857,7 +84982,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86028,7 +85153,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86199,7 +85325,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86370,7 +85496,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List a triggered web job's history for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86381,7 +85508,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -86477,14 +85604,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -86494,10 +85620,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -86547,8 +85669,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86719,7 +85841,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -86890,7 +86012,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Get the difference in configuration settings between two web app slots.
         /// </summary>
         /// <remarks>
-        /// Get the difference in configuration settings between two web app slots.
+        /// Description for Get the difference in configuration settings between two
+        /// web app slots.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87061,7 +86184,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user.
+        /// Description for Returns all Snapshots to the user.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87232,7 +86355,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// Returns all Snapshots to the user from DRSecondary endpoint.
         /// </summary>
         /// <remarks>
-        /// Returns all Snapshots to the user from DRSecondary endpoint.
+        /// Description for Returns all Snapshots to the user from DRSecondary
+        /// endpoint.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87403,7 +86527,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List triggered web jobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List triggered web jobs for an app, or a deployment slot.
+        /// Description for List triggered web jobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87574,7 +86698,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List a triggered web job's history for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List a triggered web job's history for an app, or a deployment slot.
+        /// Description for List a triggered web job's history for an app, or a
+        /// deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87585,7 +86710,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="SerializationException">
@@ -87681,14 +86806,13 @@ internal WebAppsOperations(WebSiteManagementClient client)
             string _responseContent = null;
             if ((int)_statusCode != 200 && (int)_statusCode != 404)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(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);
+                    DefaultErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, Client.DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -87698,10 +86822,6 @@ internal WebAppsOperations(WebSiteManagementClient 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);
@@ -87751,8 +86871,8 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// specified).
         /// </summary>
         /// <remarks>
-        /// Gets the quota usage information of an app (or deployment slot, if
-        /// specified).
+        /// Description for Gets the quota usage information of an app (or deployment
+        /// slot, if specified).
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -87923,7 +87043,7 @@ internal WebAppsOperations(WebSiteManagementClient client)
         /// List webjobs for an app, or a deployment slot.
         /// </summary>
         /// <remarks>
-        /// List webjobs for an app, or a deployment slot.
+        /// Description for List webjobs for an app, or a deployment slot.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs
index 512c4ef50f86..aa541d302afd 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebAppsOperationsExtensions.cs
@@ -28,7 +28,7 @@ public static partial class WebAppsOperationsExtensions
             /// Get all apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all apps for a subscription.
+            /// Description for Get all apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -42,7 +42,7 @@ public static IPage<Site> List(this IWebAppsOperations operations)
             /// Get all apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all apps for a subscription.
+            /// Description for Get all apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -62,7 +62,8 @@ public static IPage<Site> List(this IWebAppsOperations operations)
             /// Gets all web, mobile, and API apps in the specified resource group.
             /// </summary>
             /// <remarks>
-            /// Gets all web, mobile, and API apps in the specified resource group.
+            /// Description for Gets all web, mobile, and API apps in the specified
+            /// resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -84,7 +85,8 @@ public static IPage<Site> List(this IWebAppsOperations operations)
             /// Gets all web, mobile, and API apps in the specified resource group.
             /// </summary>
             /// <remarks>
-            /// Gets all web, mobile, and API apps in the specified resource group.
+            /// Description for Gets all web, mobile, and API apps in the specified
+            /// resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -112,7 +114,7 @@ public static IPage<Site> List(this IWebAppsOperations operations)
             /// Gets the details of a web, mobile, or API app.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a web, mobile, or API app.
+            /// Description for Gets the details of a web, mobile, or API app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -132,7 +134,7 @@ public static Site Get(this IWebAppsOperations operations, string resourceGroupN
             /// Gets the details of a web, mobile, or API app.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a web, mobile, or API app.
+            /// Description for Gets the details of a web, mobile, or API app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -159,8 +161,8 @@ public static Site Get(this IWebAppsOperations operations, string resourceGroupN
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -185,8 +187,8 @@ public static Site CreateOrUpdate(this IWebAppsOperations operations, string res
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -216,7 +218,8 @@ public static Site CreateOrUpdate(this IWebAppsOperations operations, string res
             /// Deletes a web, mobile, or API app, or one of the deployment slots.
             /// </summary>
             /// <remarks>
-            /// Deletes a web, mobile, or API app, or one of the deployment slots.
+            /// Description for Deletes a web, mobile, or API app, or one of the deployment
+            /// slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -244,7 +247,8 @@ public static Site CreateOrUpdate(this IWebAppsOperations operations, string res
             /// Deletes a web, mobile, or API app, or one of the deployment slots.
             /// </summary>
             /// <remarks>
-            /// Deletes a web, mobile, or API app, or one of the deployment slots.
+            /// Description for Deletes a web, mobile, or API app, or one of the deployment
+            /// slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -276,8 +280,8 @@ public static Site CreateOrUpdate(this IWebAppsOperations operations, string res
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -302,8 +306,8 @@ public static Site Update(this IWebAppsOperations operations, string resourceGro
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -333,7 +337,7 @@ public static Site Update(this IWebAppsOperations operations, string resourceGro
             /// Analyze a custom hostname.
             /// </summary>
             /// <remarks>
-            /// Analyze a custom hostname.
+            /// Description for Analyze a custom hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -356,7 +360,7 @@ public static Site Update(this IWebAppsOperations operations, string resourceGro
             /// Analyze a custom hostname.
             /// </summary>
             /// <remarks>
-            /// Analyze a custom hostname.
+            /// Description for Analyze a custom hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -386,8 +390,8 @@ public static Site Update(this IWebAppsOperations operations, string resourceGro
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Applies the configuration settings from the target slot onto the current
-            /// slot.
+            /// Description for Applies the configuration settings from the target slot
+            /// onto the current slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -411,8 +415,8 @@ public static void ApplySlotConfigToProduction(this IWebAppsOperations operation
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Applies the configuration settings from the target slot onto the current
-            /// slot.
+            /// Description for Applies the configuration settings from the target slot
+            /// onto the current slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -438,7 +442,7 @@ public static void ApplySlotConfigToProduction(this IWebAppsOperations operation
             /// Creates a backup of an app.
             /// </summary>
             /// <remarks>
-            /// Creates a backup of an app.
+            /// Description for Creates a backup of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -462,7 +466,7 @@ public static BackupItem Backup(this IWebAppsOperations operations, string resou
             /// Creates a backup of an app.
             /// </summary>
             /// <remarks>
-            /// Creates a backup of an app.
+            /// Description for Creates a backup of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -492,7 +496,7 @@ public static BackupItem Backup(this IWebAppsOperations operations, string resou
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -512,7 +516,7 @@ public static IPage<BackupItem> ListBackups(this IWebAppsOperations operations,
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -538,7 +542,7 @@ public static IPage<BackupItem> ListBackups(this IWebAppsOperations operations,
             /// Gets a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Gets a backup of an app by its ID.
+            /// Description for Gets a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -561,7 +565,7 @@ public static BackupItem GetBackupStatus(this IWebAppsOperations operations, str
             /// Gets a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Gets a backup of an app by its ID.
+            /// Description for Gets a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -590,7 +594,7 @@ public static BackupItem GetBackupStatus(this IWebAppsOperations operations, str
             /// Deletes a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Deletes a backup of an app by its ID.
+            /// Description for Deletes a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -613,7 +617,7 @@ public static void DeleteBackup(this IWebAppsOperations operations, string resou
             /// Deletes a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Deletes a backup of an app by its ID.
+            /// Description for Deletes a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -642,10 +646,10 @@ public static void DeleteBackup(this IWebAppsOperations operations, string resou
             /// request body.
             /// </summary>
             /// <remarks>
-            /// Gets status of a web app backup that may be in progress, including secrets
-            /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-            /// used to update the SAS URL for the backup if a new URL is passed in the
-            /// request body.
+            /// Description for Gets status of a web app backup that may be in progress,
+            /// including secrets associated with the backup, such as the Azure Storage SAS
+            /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+            /// passed in the request body.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -674,10 +678,10 @@ public static BackupItem ListBackupStatusSecrets(this IWebAppsOperations operati
             /// request body.
             /// </summary>
             /// <remarks>
-            /// Gets status of a web app backup that may be in progress, including secrets
-            /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-            /// used to update the SAS URL for the backup if a new URL is passed in the
-            /// request body.
+            /// Description for Gets status of a web app backup that may be in progress,
+            /// including secrets associated with the backup, such as the Azure Storage SAS
+            /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+            /// passed in the request body.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -710,8 +714,8 @@ public static BackupItem ListBackupStatusSecrets(this IWebAppsOperations operati
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -738,8 +742,8 @@ public static void Restore(this IWebAppsOperations operations, string resourceGr
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -768,7 +772,7 @@ public static void Restore(this IWebAppsOperations operations, string resourceGr
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -788,7 +792,7 @@ public static IPage<SiteConfigResource> ListConfigurations(this IWebAppsOperatio
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -814,7 +818,7 @@ public static IPage<SiteConfigResource> ListConfigurations(this IWebAppsOperatio
             /// Replaces the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the application settings of an app.
+            /// Description for Replaces the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -837,7 +841,7 @@ public static StringDictionary UpdateApplicationSettings(this IWebAppsOperations
             /// Replaces the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the application settings of an app.
+            /// Description for Replaces the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -866,7 +870,7 @@ public static StringDictionary UpdateApplicationSettings(this IWebAppsOperations
             /// Gets the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the application settings of an app.
+            /// Description for Gets the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -886,7 +890,7 @@ public static StringDictionary ListApplicationSettings(this IWebAppsOperations o
             /// Gets the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the application settings of an app.
+            /// Description for Gets the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -913,8 +917,8 @@ public static StringDictionary ListApplicationSettings(this IWebAppsOperations o
             /// app.
             /// </summary>
             /// <remarks>
-            /// Updates the Authentication / Authorization settings associated with web
-            /// app.
+            /// Description for Updates the Authentication / Authorization settings
+            /// associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -938,8 +942,8 @@ public static SiteAuthSettings UpdateAuthSettings(this IWebAppsOperations operat
             /// app.
             /// </summary>
             /// <remarks>
-            /// Updates the Authentication / Authorization settings associated with web
-            /// app.
+            /// Description for Updates the Authentication / Authorization settings
+            /// associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -968,7 +972,7 @@ public static SiteAuthSettings UpdateAuthSettings(this IWebAppsOperations operat
             /// Gets the Authentication/Authorization settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Authentication/Authorization settings of an app.
+            /// Description for Gets the Authentication/Authorization settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -988,7 +992,7 @@ public static SiteAuthSettings GetAuthSettings(this IWebAppsOperations operation
             /// Gets the Authentication/Authorization settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Authentication/Authorization settings of an app.
+            /// Description for Gets the Authentication/Authorization settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1014,7 +1018,7 @@ public static SiteAuthSettings GetAuthSettings(this IWebAppsOperations operation
             /// Updates the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the Azure storage account configurations of an app.
+            /// Description for Updates the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1037,7 +1041,7 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts(
             /// Updates the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the Azure storage account configurations of an app.
+            /// Description for Updates the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1066,7 +1070,7 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccounts(
             /// Gets the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Azure storage account configurations of an app.
+            /// Description for Gets the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1086,7 +1090,7 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(th
             /// Gets the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Azure storage account configurations of an app.
+            /// Description for Gets the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1112,7 +1116,7 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccounts(th
             /// Updates the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the backup configuration of an app.
+            /// Description for Updates the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1135,7 +1139,7 @@ public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations op
             /// Updates the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the backup configuration of an app.
+            /// Description for Updates the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1164,7 +1168,7 @@ public static BackupRequest UpdateBackupConfiguration(this IWebAppsOperations op
             /// Deletes the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the backup configuration of an app.
+            /// Description for Deletes the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1184,7 +1188,7 @@ public static void DeleteBackupConfiguration(this IWebAppsOperations operations,
             /// Deletes the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the backup configuration of an app.
+            /// Description for Deletes the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1207,7 +1211,7 @@ public static void DeleteBackupConfiguration(this IWebAppsOperations operations,
             /// Gets the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the backup configuration of an app.
+            /// Description for Gets the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1227,7 +1231,7 @@ public static BackupRequest GetBackupConfiguration(this IWebAppsOperations opera
             /// Gets the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the backup configuration of an app.
+            /// Description for Gets the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1250,10 +1254,108 @@ public static BackupRequest GetBackupConfiguration(this IWebAppsOperations opera
             }
 
             /// <summary>
-            /// Replaces the connection strings of an app.
+            /// Gets the config reference app settings and status of an app
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets the config reference app settings and status of an app
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            public static KeyVaultReferenceCollection GetAppSettingsKeyVaultReferences(this IWebAppsOperations operations, string resourceGroupName, string name)
+            {
+                return operations.GetAppSettingsKeyVaultReferencesAsync(resourceGroupName, name).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets the config reference app settings and status of an app
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets the config reference app settings and status of an app
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<KeyVaultReferenceCollection> GetAppSettingsKeyVaultReferencesAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetAppSettingsKeyVaultReferencesWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Gets the config reference and status of an app
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets the config reference and status of an app
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='appSettingKey'>
+            /// App Setting key name.
+            /// </param>
+            public static KeyVaultReferenceResource GetAppSettingKeyVaultReference(this IWebAppsOperations operations, string resourceGroupName, string name, string appSettingKey)
+            {
+                return operations.GetAppSettingKeyVaultReferenceAsync(resourceGroupName, name, appSettingKey).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets the config reference and status of an app
             /// </summary>
             /// <remarks>
+            /// Description for Gets the config reference and status of an app
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='appSettingKey'>
+            /// App Setting key name.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<KeyVaultReferenceResource> GetAppSettingKeyVaultReferenceAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string appSettingKey, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetAppSettingKeyVaultReferenceWithHttpMessagesAsync(resourceGroupName, name, appSettingKey, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
             /// Replaces the connection strings of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Replaces the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1276,7 +1378,7 @@ public static ConnectionStringDictionary UpdateConnectionStrings(this IWebAppsOp
             /// Replaces the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the connection strings of an app.
+            /// Description for Replaces the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1305,7 +1407,7 @@ public static ConnectionStringDictionary UpdateConnectionStrings(this IWebAppsOp
             /// Gets the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the connection strings of an app.
+            /// Description for Gets the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1325,7 +1427,7 @@ public static ConnectionStringDictionary ListConnectionStrings(this IWebAppsOper
             /// Gets the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the connection strings of an app.
+            /// Description for Gets the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1351,7 +1453,7 @@ public static ConnectionStringDictionary ListConnectionStrings(this IWebAppsOper
             /// Gets the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the logging configuration of an app.
+            /// Description for Gets the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1371,7 +1473,7 @@ public static SiteLogsConfig GetDiagnosticLogsConfiguration(this IWebAppsOperati
             /// Gets the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the logging configuration of an app.
+            /// Description for Gets the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1397,7 +1499,7 @@ public static SiteLogsConfig GetDiagnosticLogsConfiguration(this IWebAppsOperati
             /// Updates the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the logging configuration of an app.
+            /// Description for Updates the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1421,7 +1523,7 @@ public static SiteLogsConfig UpdateDiagnosticLogsConfig(this IWebAppsOperations
             /// Updates the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the logging configuration of an app.
+            /// Description for Updates the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1451,7 +1553,7 @@ public static SiteLogsConfig UpdateDiagnosticLogsConfig(this IWebAppsOperations
             /// Replaces the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the metadata of an app.
+            /// Description for Replaces the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1474,7 +1576,7 @@ public static StringDictionary UpdateMetadata(this IWebAppsOperations operations
             /// Replaces the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the metadata of an app.
+            /// Description for Replaces the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1503,7 +1605,7 @@ public static StringDictionary UpdateMetadata(this IWebAppsOperations operations
             /// Gets the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the metadata of an app.
+            /// Description for Gets the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1523,7 +1625,7 @@ public static StringDictionary ListMetadata(this IWebAppsOperations operations,
             /// Gets the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the metadata of an app.
+            /// Description for Gets the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1549,7 +1651,7 @@ public static StringDictionary ListMetadata(this IWebAppsOperations operations,
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1569,7 +1671,7 @@ public static User ListPublishingCredentials(this IWebAppsOperations operations,
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1595,7 +1697,7 @@ public static User ListPublishingCredentials(this IWebAppsOperations operations,
             /// Updates the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Updates the Push settings associated with web app.
+            /// Description for Updates the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1618,7 +1720,7 @@ public static PushSettings UpdateSitePushSettings(this IWebAppsOperations operat
             /// Updates the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Updates the Push settings associated with web app.
+            /// Description for Updates the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1647,7 +1749,7 @@ public static PushSettings UpdateSitePushSettings(this IWebAppsOperations operat
             /// Gets the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Gets the Push settings associated with web app.
+            /// Description for Gets the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1667,7 +1769,7 @@ public static PushSettings ListSitePushSettings(this IWebAppsOperations operatio
             /// Gets the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Gets the Push settings associated with web app.
+            /// Description for Gets the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1694,8 +1796,8 @@ public static PushSettings ListSitePushSettings(this IWebAppsOperations operatio
             /// slot (not swapped).
             /// </summary>
             /// <remarks>
-            /// Gets the names of app settings and connection strings that stick to the
-            /// slot (not swapped).
+            /// Description for Gets the names of app settings and connection strings that
+            /// stick to the slot (not swapped).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1716,8 +1818,8 @@ public static SlotConfigNamesResource ListSlotConfigurationNames(this IWebAppsOp
             /// slot (not swapped).
             /// </summary>
             /// <remarks>
-            /// Gets the names of app settings and connection strings that stick to the
-            /// slot (not swapped).
+            /// Description for Gets the names of app settings and connection strings that
+            /// stick to the slot (not swapped).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1744,8 +1846,8 @@ public static SlotConfigNamesResource ListSlotConfigurationNames(this IWebAppsOp
             /// with the slot during swap operation.
             /// </summary>
             /// <remarks>
-            /// Updates the names of application settings and connection string that remain
-            /// with the slot during swap operation.
+            /// Description for Updates the names of application settings and connection
+            /// string that remain with the slot during swap operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1769,8 +1871,8 @@ public static SlotConfigNamesResource UpdateSlotConfigurationNames(this IWebApps
             /// with the slot during swap operation.
             /// </summary>
             /// <remarks>
-            /// Updates the names of application settings and connection string that remain
-            /// with the slot during swap operation.
+            /// Description for Updates the names of application settings and connection
+            /// string that remain with the slot during swap operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1800,8 +1902,8 @@ public static SlotConfigNamesResource UpdateSlotConfigurationNames(this IWebApps
             /// default documents, virtual applications, Always On, etc.
             /// </summary>
             /// <remarks>
-            /// Gets the configuration of an app, such as platform version and bitness,
-            /// default documents, virtual applications, Always On, etc.
+            /// Description for Gets the configuration of an app, such as platform version
+            /// and bitness, default documents, virtual applications, Always On, etc.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1822,8 +1924,8 @@ public static SiteConfigResource GetConfiguration(this IWebAppsOperations operat
             /// default documents, virtual applications, Always On, etc.
             /// </summary>
             /// <remarks>
-            /// Gets the configuration of an app, such as platform version and bitness,
-            /// default documents, virtual applications, Always On, etc.
+            /// Description for Gets the configuration of an app, such as platform version
+            /// and bitness, default documents, virtual applications, Always On, etc.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1849,7 +1951,7 @@ public static SiteConfigResource GetConfiguration(this IWebAppsOperations operat
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1872,7 +1974,7 @@ public static SiteConfigResource CreateOrUpdateConfiguration(this IWebAppsOperat
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1901,7 +2003,7 @@ public static SiteConfigResource CreateOrUpdateConfiguration(this IWebAppsOperat
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1924,7 +2026,7 @@ public static SiteConfigResource UpdateConfiguration(this IWebAppsOperations ope
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1954,8 +2056,8 @@ public static SiteConfigResource UpdateConfiguration(this IWebAppsOperations ope
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -1976,8 +2078,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2003,7 +2105,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// Gets a snapshot of the configuration of an app at a previous point in time.
             /// </summary>
             /// <remarks>
-            /// Gets a snapshot of the configuration of an app at a previous point in time.
+            /// Description for Gets a snapshot of the configuration of an app at a
+            /// previous point in time.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2026,7 +2129,8 @@ public static SiteConfigResource GetConfigurationSnapshot(this IWebAppsOperation
             /// Gets a snapshot of the configuration of an app at a previous point in time.
             /// </summary>
             /// <remarks>
-            /// Gets a snapshot of the configuration of an app at a previous point in time.
+            /// Description for Gets a snapshot of the configuration of an app at a
+            /// previous point in time.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2055,7 +2159,7 @@ public static SiteConfigResource GetConfigurationSnapshot(this IWebAppsOperation
             /// Reverts the configuration of an app to a previous snapshot.
             /// </summary>
             /// <remarks>
-            /// Reverts the configuration of an app to a previous snapshot.
+            /// Description for Reverts the configuration of an app to a previous snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2078,7 +2182,7 @@ public static void RecoverSiteConfigurationSnapshot(this IWebAppsOperations oper
             /// Reverts the configuration of an app to a previous snapshot.
             /// </summary>
             /// <remarks>
-            /// Reverts the configuration of an app to a previous snapshot.
+            /// Description for Reverts the configuration of an app to a previous snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2104,7 +2208,7 @@ public static void RecoverSiteConfigurationSnapshot(this IWebAppsOperations oper
             /// Gets the last lines of docker logs for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the last lines of docker logs for the given site
+            /// Description for Gets the last lines of docker logs for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2124,7 +2228,7 @@ public static Stream GetWebSiteContainerLogs(this IWebAppsOperations operations,
             /// Gets the last lines of docker logs for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the last lines of docker logs for the given site
+            /// Description for Gets the last lines of docker logs for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2149,7 +2253,7 @@ public static Stream GetWebSiteContainerLogs(this IWebAppsOperations operations,
             /// Gets the ZIP archived docker log files for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the ZIP archived docker log files for the given site
+            /// Description for Gets the ZIP archived docker log files for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2169,7 +2273,7 @@ public static Stream GetContainerLogsZip(this IWebAppsOperations operations, str
             /// Gets the ZIP archived docker log files for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the ZIP archived docker log files for the given site
+            /// Description for Gets the ZIP archived docker log files for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2194,7 +2298,7 @@ public static Stream GetContainerLogsZip(this IWebAppsOperations operations, str
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2214,7 +2318,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobs(this IWebAppsOperati
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2240,7 +2344,8 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobs(this IWebAppsOperati
             /// Gets a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2263,7 +2368,8 @@ public static ContinuousWebJob GetContinuousWebJob(this IWebAppsOperations opera
             /// Gets a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2292,7 +2398,8 @@ public static ContinuousWebJob GetContinuousWebJob(this IWebAppsOperations opera
             /// Delete a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2315,7 +2422,8 @@ public static void DeleteContinuousWebJob(this IWebAppsOperations operations, st
             /// Delete a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2341,7 +2449,8 @@ public static void DeleteContinuousWebJob(this IWebAppsOperations operations, st
             /// Start a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Start a continuous web job for an app, or a deployment slot.
+            /// Description for Start a continuous web job for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2364,7 +2473,8 @@ public static void StartContinuousWebJob(this IWebAppsOperations operations, str
             /// Start a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Start a continuous web job for an app, or a deployment slot.
+            /// Description for Start a continuous web job for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2390,7 +2500,7 @@ public static void StartContinuousWebJob(this IWebAppsOperations operations, str
             /// Stop a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Stop a continuous web job for an app, or a deployment slot.
+            /// Description for Stop a continuous web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2413,7 +2523,7 @@ public static void StopContinuousWebJob(this IWebAppsOperations operations, stri
             /// Stop a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Stop a continuous web job for an app, or a deployment slot.
+            /// Description for Stop a continuous web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2439,7 +2549,7 @@ public static void StopContinuousWebJob(this IWebAppsOperations operations, stri
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2459,7 +2569,7 @@ public static IPage<Deployment> ListDeployments(this IWebAppsOperations operatio
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2485,7 +2595,8 @@ public static IPage<Deployment> ListDeployments(this IWebAppsOperations operatio
             /// Get a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get a deployment by its ID for an app, or a deployment slot.
+            /// Description for Get a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2508,7 +2619,8 @@ public static Deployment GetDeployment(this IWebAppsOperations operations, strin
             /// Get a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get a deployment by its ID for an app, or a deployment slot.
+            /// Description for Get a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2537,7 +2649,7 @@ public static Deployment GetDeployment(this IWebAppsOperations operations, strin
             /// Create a deployment for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create a deployment for an app, or a deployment slot.
+            /// Description for Create a deployment for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2563,7 +2675,7 @@ public static Deployment CreateDeployment(this IWebAppsOperations operations, st
             /// Create a deployment for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create a deployment for an app, or a deployment slot.
+            /// Description for Create a deployment for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2595,7 +2707,8 @@ public static Deployment CreateDeployment(this IWebAppsOperations operations, st
             /// Delete a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a deployment by its ID for an app, or a deployment slot.
+            /// Description for Delete a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2618,7 +2731,8 @@ public static void DeleteDeployment(this IWebAppsOperations operations, string r
             /// Delete a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a deployment by its ID for an app, or a deployment slot.
+            /// Description for Delete a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2645,8 +2759,8 @@ public static void DeleteDeployment(this IWebAppsOperations operations, string r
             /// slot.
             /// </summary>
             /// <remarks>
-            /// List deployment log for specific deployment for an app, or a deployment
-            /// slot.
+            /// Description for List deployment log for specific deployment for an app, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2671,8 +2785,8 @@ public static Deployment ListDeploymentLog(this IWebAppsOperations operations, s
             /// slot.
             /// </summary>
             /// <remarks>
-            /// List deployment log for specific deployment for an app, or a deployment
-            /// slot.
+            /// Description for List deployment log for specific deployment for an app, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2704,9 +2818,9 @@ public static Deployment ListDeploymentLog(this IWebAppsOperations operations, s
             /// backup.
             /// </summary>
             /// <remarks>
-            /// Discovers an existing app backup that can be restored from a blob in Azure
-            /// storage. Use this to get information about the databases stored in a
-            /// backup.
+            /// Description for Discovers an existing app backup that can be restored from
+            /// a blob in Azure storage. Use this to get information about the databases
+            /// stored in a backup.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2732,9 +2846,9 @@ public static RestoreRequest DiscoverBackup(this IWebAppsOperations operations,
             /// backup.
             /// </summary>
             /// <remarks>
-            /// Discovers an existing app backup that can be restored from a blob in Azure
-            /// storage. Use this to get information about the databases stored in a
-            /// backup.
+            /// Description for Discovers an existing app backup that can be restored from
+            /// a blob in Azure storage. Use this to get information about the databases
+            /// stored in a backup.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2764,7 +2878,8 @@ public static RestoreRequest DiscoverBackup(this IWebAppsOperations operations,
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2784,7 +2899,8 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiers(this IWebAppsOper
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2810,7 +2926,7 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiers(this IWebAppsOper
             /// Get domain ownership identifier for web app.
             /// </summary>
             /// <remarks>
-            /// Get domain ownership identifier for web app.
+            /// Description for Get domain ownership identifier for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2833,7 +2949,7 @@ public static Identifier GetDomainOwnershipIdentifier(this IWebAppsOperations op
             /// Get domain ownership identifier for web app.
             /// </summary>
             /// <remarks>
-            /// Get domain ownership identifier for web app.
+            /// Description for Get domain ownership identifier for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2863,8 +2979,8 @@ public static Identifier GetDomainOwnershipIdentifier(this IWebAppsOperations op
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2891,8 +3007,8 @@ public static Identifier CreateOrUpdateDomainOwnershipIdentifier(this IWebAppsOp
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2924,7 +3040,7 @@ public static Identifier CreateOrUpdateDomainOwnershipIdentifier(this IWebAppsOp
             /// Deletes a domain ownership identifier for a web app.
             /// </summary>
             /// <remarks>
-            /// Deletes a domain ownership identifier for a web app.
+            /// Description for Deletes a domain ownership identifier for a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2947,7 +3063,7 @@ public static void DeleteDomainOwnershipIdentifier(this IWebAppsOperations opera
             /// Deletes a domain ownership identifier for a web app.
             /// </summary>
             /// <remarks>
-            /// Deletes a domain ownership identifier for a web app.
+            /// Description for Deletes a domain ownership identifier for a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -2974,8 +3090,8 @@ public static void DeleteDomainOwnershipIdentifier(this IWebAppsOperations opera
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3002,8 +3118,8 @@ public static Identifier UpdateDomainOwnershipIdentifier(this IWebAppsOperations
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3035,7 +3151,7 @@ public static Identifier UpdateDomainOwnershipIdentifier(this IWebAppsOperations
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3055,7 +3171,7 @@ public static MSDeployStatus GetMSDeployStatus(this IWebAppsOperations operation
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3081,7 +3197,7 @@ public static MSDeployStatus GetMSDeployStatus(this IWebAppsOperations operation
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3104,7 +3220,7 @@ public static MSDeployStatus CreateMSDeployOperation(this IWebAppsOperations ope
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3133,7 +3249,7 @@ public static MSDeployStatus CreateMSDeployOperation(this IWebAppsOperations ope
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3153,7 +3269,7 @@ public static MSDeployLog GetMSDeployLog(this IWebAppsOperations operations, str
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3179,7 +3295,7 @@ public static MSDeployLog GetMSDeployLog(this IWebAppsOperations operations, str
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3199,7 +3315,7 @@ public static IPage<FunctionEnvelope> ListFunctions(this IWebAppsOperations oper
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3225,7 +3341,8 @@ public static IPage<FunctionEnvelope> ListFunctions(this IWebAppsOperations oper
             /// Fetch a short lived token that can be exchanged for a master key.
             /// </summary>
             /// <remarks>
-            /// Fetch a short lived token that can be exchanged for a master key.
+            /// Description for Fetch a short lived token that can be exchanged for a
+            /// master key.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3245,7 +3362,8 @@ public static string GetFunctionsAdminToken(this IWebAppsOperations operations,
             /// Fetch a short lived token that can be exchanged for a master key.
             /// </summary>
             /// <remarks>
-            /// Fetch a short lived token that can be exchanged for a master key.
+            /// Description for Fetch a short lived token that can be exchanged for a
+            /// master key.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3271,7 +3389,8 @@ public static string GetFunctionsAdminToken(this IWebAppsOperations operations,
             /// Get function information by its ID for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function information by its ID for web site, or a deployment slot.
+            /// Description for Get function information by its ID for web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3294,7 +3413,8 @@ public static FunctionEnvelope GetFunction(this IWebAppsOperations operations, s
             /// Get function information by its ID for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function information by its ID for web site, or a deployment slot.
+            /// Description for Get function information by its ID for web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3323,7 +3443,7 @@ public static FunctionEnvelope GetFunction(this IWebAppsOperations operations, s
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3349,7 +3469,7 @@ public static FunctionEnvelope CreateFunction(this IWebAppsOperations operations
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3381,7 +3501,7 @@ public static FunctionEnvelope CreateFunction(this IWebAppsOperations operations
             /// Delete a function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a function for web site, or a deployment slot.
+            /// Description for Delete a function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3404,7 +3524,7 @@ public static void DeleteFunction(this IWebAppsOperations operations, string res
             /// Delete a function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a function for web site, or a deployment slot.
+            /// Description for Delete a function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3430,7 +3550,8 @@ public static void DeleteFunction(this IWebAppsOperations operations, string res
             /// Get function secrets for a function in a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function secrets for a function in a web site, or a deployment slot.
+            /// Description for Get function secrets for a function in a web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3453,7 +3574,8 @@ public static FunctionSecrets ListFunctionSecrets(this IWebAppsOperations operat
             /// Get function secrets for a function in a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function secrets for a function in a web site, or a deployment slot.
+            /// Description for Get function secrets for a function in a web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3482,7 +3604,7 @@ public static FunctionSecrets ListFunctionSecrets(this IWebAppsOperations operat
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3502,7 +3624,7 @@ public static IPage<HostNameBinding> ListHostNameBindings(this IWebAppsOperation
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3529,8 +3651,8 @@ public static IPage<HostNameBinding> ListHostNameBindings(this IWebAppsOperation
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named hostname binding for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named hostname binding for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3554,8 +3676,8 @@ public static HostNameBinding GetHostNameBinding(this IWebAppsOperations operati
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named hostname binding for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named hostname binding for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3584,7 +3706,7 @@ public static HostNameBinding GetHostNameBinding(this IWebAppsOperations operati
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3611,7 +3733,7 @@ public static HostNameBinding CreateOrUpdateHostNameBinding(this IWebAppsOperati
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3644,7 +3766,7 @@ public static HostNameBinding CreateOrUpdateHostNameBinding(this IWebAppsOperati
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3667,7 +3789,7 @@ public static void DeleteHostNameBinding(this IWebAppsOperations operations, str
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3693,7 +3815,8 @@ public static void DeleteHostNameBinding(this IWebAppsOperations operations, str
             /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+            /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+            /// this Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3719,7 +3842,8 @@ public static HybridConnection GetHybridConnection(this IWebAppsOperations opera
             /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+            /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+            /// this Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3751,7 +3875,7 @@ public static HybridConnection GetHybridConnection(this IWebAppsOperations opera
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3780,7 +3904,7 @@ public static HybridConnection CreateOrUpdateHybridConnection(this IWebAppsOpera
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3815,7 +3939,7 @@ public static HybridConnection CreateOrUpdateHybridConnection(this IWebAppsOpera
             /// Removes a Hybrid Connection from this site.
             /// </summary>
             /// <remarks>
-            /// Removes a Hybrid Connection from this site.
+            /// Description for Removes a Hybrid Connection from this site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3841,7 +3965,7 @@ public static void DeleteHybridConnection(this IWebAppsOperations operations, st
             /// Removes a Hybrid Connection from this site.
             /// </summary>
             /// <remarks>
-            /// Removes a Hybrid Connection from this site.
+            /// Description for Removes a Hybrid Connection from this site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3870,7 +3994,7 @@ public static void DeleteHybridConnection(this IWebAppsOperations operations, st
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3899,7 +4023,7 @@ public static HybridConnection UpdateHybridConnection(this IWebAppsOperations op
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -3930,69 +4054,12 @@ public static HybridConnection UpdateHybridConnection(this IWebAppsOperations op
                 }
             }
 
-            /// <summary>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </summary>
-            /// <remarks>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// The name of the web app.
-            /// </param>
-            /// <param name='namespaceName'>
-            /// The namespace for this hybrid connection.
-            /// </param>
-            /// <param name='relayName'>
-            /// The relay name for this hybrid connection.
-            /// </param>
-            public static HybridConnectionKey ListHybridConnectionKeys(this IWebAppsOperations operations, string resourceGroupName, string name, string namespaceName, string relayName)
-            {
-                return operations.ListHybridConnectionKeysAsync(resourceGroupName, name, namespaceName, relayName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </summary>
-            /// <remarks>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// The name of the web app.
-            /// </param>
-            /// <param name='namespaceName'>
-            /// The namespace for this hybrid connection.
-            /// </param>
-            /// <param name='relayName'>
-            /// The relay name for this hybrid connection.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<HybridConnectionKey> ListHybridConnectionKeysAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string namespaceName, string relayName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListHybridConnectionKeysWithHttpMessagesAsync(resourceGroupName, name, namespaceName, relayName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Retrieves all Service Bus Hybrid Connections used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+            /// Description for Retrieves all Service Bus Hybrid Connections used by this
+            /// Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4012,7 +4079,8 @@ public static HybridConnection ListHybridConnections(this IWebAppsOperations ope
             /// Retrieves all Service Bus Hybrid Connections used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+            /// Description for Retrieves all Service Bus Hybrid Connections used by this
+            /// Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4039,8 +4107,8 @@ public static HybridConnection ListHybridConnections(this IWebAppsOperations ope
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets hybrid connections configured for an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets hybrid connections configured for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4061,8 +4129,8 @@ public static RelayServiceConnectionEntity ListRelayServiceConnections(this IWeb
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets hybrid connections configured for an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets hybrid connections configured for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4088,7 +4156,7 @@ public static RelayServiceConnectionEntity ListRelayServiceConnections(this IWeb
             /// Gets a hybrid connection configuration by its name.
             /// </summary>
             /// <remarks>
-            /// Gets a hybrid connection configuration by its name.
+            /// Description for Gets a hybrid connection configuration by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4111,7 +4179,7 @@ public static RelayServiceConnectionEntity GetRelayServiceConnection(this IWebAp
             /// Gets a hybrid connection configuration by its name.
             /// </summary>
             /// <remarks>
-            /// Gets a hybrid connection configuration by its name.
+            /// Description for Gets a hybrid connection configuration by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4141,8 +4209,8 @@ public static RelayServiceConnectionEntity GetRelayServiceConnection(this IWebAp
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4169,8 +4237,8 @@ public static RelayServiceConnectionEntity CreateOrUpdateRelayServiceConnection(
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4202,7 +4270,7 @@ public static RelayServiceConnectionEntity CreateOrUpdateRelayServiceConnection(
             /// Deletes a relay service connection by its name.
             /// </summary>
             /// <remarks>
-            /// Deletes a relay service connection by its name.
+            /// Description for Deletes a relay service connection by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4225,7 +4293,7 @@ public static void DeleteRelayServiceConnection(this IWebAppsOperations operatio
             /// Deletes a relay service connection by its name.
             /// </summary>
             /// <remarks>
-            /// Deletes a relay service connection by its name.
+            /// Description for Deletes a relay service connection by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4252,8 +4320,8 @@ public static void DeleteRelayServiceConnection(this IWebAppsOperations operatio
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4280,8 +4348,8 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnection(this IWe
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4313,7 +4381,7 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnection(this IWe
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4333,7 +4401,7 @@ public static IPage<SiteInstance> ListInstanceIdentifiers(this IWebAppsOperation
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4356,10 +4424,60 @@ public static IPage<SiteInstance> ListInstanceIdentifiers(this IWebAppsOperation
             }
 
             /// <summary>
-            /// Get the status of the last MSDeploy operation.
+            /// Gets all scale-out instances of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets all scale-out instances of an app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='instanceId'>
+            /// </param>
+            public static WebSiteInstanceStatus GetInstanceInfo(this IWebAppsOperations operations, string resourceGroupName, string name, string instanceId)
+            {
+                return operations.GetInstanceInfoAsync(resourceGroupName, name, instanceId).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
+            /// Description for Gets all scale-out instances of an app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='instanceId'>
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<WebSiteInstanceStatus> GetInstanceInfoAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetInstanceInfoWithHttpMessagesAsync(resourceGroupName, name, instanceId, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
             /// Get the status of the last MSDeploy operation.
+            /// </summary>
+            /// <remarks>
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4382,7 +4500,7 @@ public static MSDeployStatus GetInstanceMsDeployStatus(this IWebAppsOperations o
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4411,7 +4529,7 @@ public static MSDeployStatus GetInstanceMsDeployStatus(this IWebAppsOperations o
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4437,7 +4555,7 @@ public static MSDeployStatus CreateInstanceMSDeployOperation(this IWebAppsOperat
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4469,7 +4587,7 @@ public static MSDeployStatus CreateInstanceMSDeployOperation(this IWebAppsOperat
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4492,7 +4610,7 @@ public static MSDeployLog GetInstanceMSDeployLog(this IWebAppsOperations operati
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4522,8 +4640,8 @@ public static MSDeployLog GetInstanceMSDeployLog(this IWebAppsOperations operati
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4548,8 +4666,8 @@ public static IPage<ProcessInfo> ListInstanceProcesses(this IWebAppsOperations o
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4580,8 +4698,8 @@ public static IPage<ProcessInfo> ListInstanceProcesses(this IWebAppsOperations o
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4609,8 +4727,8 @@ public static ProcessInfo GetInstanceProcess(this IWebAppsOperations operations,
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4644,8 +4762,8 @@ public static ProcessInfo GetInstanceProcess(this IWebAppsOperations operations,
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4673,8 +4791,8 @@ public static void DeleteInstanceProcess(this IWebAppsOperations operations, str
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4705,8 +4823,8 @@ public static void DeleteInstanceProcess(this IWebAppsOperations operations, str
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4734,8 +4852,8 @@ public static Stream GetInstanceProcessDump(this IWebAppsOperations operations,
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4768,8 +4886,8 @@ public static Stream GetInstanceProcessDump(this IWebAppsOperations operations,
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4797,8 +4915,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModules(this IWebAppsO
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4832,8 +4950,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModules(this IWebAppsO
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4864,8 +4982,8 @@ public static ProcessModuleInfo GetInstanceProcessModule(this IWebAppsOperations
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4902,8 +5020,8 @@ public static ProcessModuleInfo GetInstanceProcessModule(this IWebAppsOperations
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4931,8 +5049,8 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreads(this IWebAppsO
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4962,12 +5080,12 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreads(this IWebAppsO
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Shows whether an app can be cloned to another resource group or
+            /// subscription.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Description for Shows whether an app can be cloned to another resource
+            /// group or subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -4976,30 +5094,20 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreads(this IWebAppsO
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
-            /// <param name='instanceId'>
-            /// ID of a specific scaled-out instance. This is the value of the name
-            /// property in the JSON response from "GET api/sites/{siteName}/instances".
+            /// Name of the app.
             /// </param>
-            public static ProcessThreadInfo GetInstanceProcessThread(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string instanceId)
+            public static SiteCloneability IsCloneable(this IWebAppsOperations operations, string resourceGroupName, string name)
             {
-                return operations.GetInstanceProcessThreadAsync(resourceGroupName, name, processId, threadId, instanceId).GetAwaiter().GetResult();
+                return operations.IsCloneableAsync(resourceGroupName, name).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Shows whether an app can be cloned to another resource group or
+            /// subscription.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Description for Shows whether an app can be cloned to another resource
+            /// group or subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5008,36 +5116,24 @@ public static ProcessThreadInfo GetInstanceProcessThread(this IWebAppsOperations
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
-            /// <param name='instanceId'>
-            /// ID of a specific scaled-out instance. This is the value of the name
-            /// property in the JSON response from "GET api/sites/{siteName}/instances".
+            /// Name of the app.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProcessThreadInfo> GetInstanceProcessThreadAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<SiteCloneability> IsCloneableAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetInstanceProcessThreadWithHttpMessagesAsync(resourceGroupName, name, processId, threadId, instanceId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.IsCloneableWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5048,18 +5144,16 @@ public static ProcessThreadInfo GetInstanceProcessThread(this IWebAppsOperations
             /// <param name='name'>
             /// Name of the app.
             /// </param>
-            public static SiteCloneability IsCloneable(this IWebAppsOperations operations, string resourceGroupName, string name)
+            public static IPage<BackupItem> ListSiteBackups(this IWebAppsOperations operations, string resourceGroupName, string name)
             {
-                return operations.IsCloneableAsync(resourceGroupName, name).GetAwaiter().GetResult();
+                return operations.ListSiteBackupsAsync(resourceGroupName, name).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5073,9 +5167,9 @@ public static SiteCloneability IsCloneable(this IWebAppsOperations operations, s
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<SiteCloneability> IsCloneableAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BackupItem>> ListSiteBackupsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.IsCloneableWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSiteBackupsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -5085,7 +5179,7 @@ public static SiteCloneability IsCloneable(this IWebAppsOperations operations, s
             /// This is to allow calling via powershell and ARM template.
             /// </summary>
             /// <remarks>
-            /// This is to allow calling via powershell and ARM template.
+            /// Description for This is to allow calling via powershell and ARM template.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5105,7 +5199,7 @@ public static FunctionSecrets ListSyncFunctionTriggers(this IWebAppsOperations o
             /// This is to allow calling via powershell and ARM template.
             /// </summary>
             /// <remarks>
-            /// This is to allow calling via powershell and ARM template.
+            /// Description for This is to allow calling via powershell and ARM template.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5128,56 +5222,69 @@ public static FunctionSecrets ListSyncFunctionTriggers(this IWebAppsOperations o
             }
 
             /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Restores a web app.
             /// </summary>
             /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Description for Restores a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
+            /// <param name='subscriptionName'>
+            /// Azure subscription.
+            /// </param>
             /// <param name='resourceGroupName'>
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Name of the app.
+            /// Name of web app.
+            /// </param>
+            /// <param name='migrationOptions'>
+            /// Migration migrationOptions.
             /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefinitions(this IWebAppsOperations operations, string resourceGroupName, string name)
+            public static StorageMigrationResponse MigrateStorage(this IWebAppsOperations operations, string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions)
             {
-                return operations.ListMetricDefinitionsAsync(resourceGroupName, name).GetAwaiter().GetResult();
+                return operations.MigrateStorageAsync(subscriptionName, resourceGroupName, name, migrationOptions).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Restores a web app.
             /// </summary>
             /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Description for Restores a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
+            /// <param name='subscriptionName'>
+            /// Azure subscription.
+            /// </param>
             /// <param name='resourceGroupName'>
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Name of the app.
+            /// Name of web app.
+            /// </param>
+            /// <param name='migrationOptions'>
+            /// Migration migrationOptions.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefinitionsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<StorageMigrationResponse> MigrateStorageAsync(this IWebAppsOperations operations, string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListMetricDefinitionsWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.MigrateStorageWithHttpMessagesAsync(subscriptionName, resourceGroupName, name, migrationOptions, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Migrates a local (in-app) MySql database to a remote MySql database.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for Migrates a local (in-app) MySql database to a remote MySql
+            /// database.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5186,134 +5293,10 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitions(this IWebApp
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='details'>
-            /// Specify "true" to include metric details in the response. It is "false" by
-            /// default.
+            /// Name of web app.
             /// </param>
-            /// <param name='filter'>
-            /// Return only metrics specified in the filter (using OData syntax). For
-            /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-            /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-            /// timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            public static IPage<ResourceMetric> ListMetrics(this IWebAppsOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string))
-            {
-                return operations.ListMetricsAsync(resourceGroupName, name, details, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
-            /// </summary>
-            /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='details'>
-            /// Specify "true" to include metric details in the response. It is "false" by
-            /// default.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only metrics specified in the filter (using OData syntax). For
-            /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-            /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-            /// timeGrain eq duration'[Hour|Minute|Day]'.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsAsync(this IWebAppsOperations operations, string resourceGroupName, string name, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricsWithHttpMessagesAsync(resourceGroupName, name, details, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Restores a web app.
-            /// </summary>
-            /// <remarks>
-            /// Restores a web app.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='subscriptionName'>
-            /// Azure subscription.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of web app.
-            /// </param>
-            /// <param name='migrationOptions'>
-            /// Migration migrationOptions.
-            /// </param>
-            public static StorageMigrationResponse MigrateStorage(this IWebAppsOperations operations, string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions)
-            {
-                return operations.MigrateStorageAsync(subscriptionName, resourceGroupName, name, migrationOptions).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Restores a web app.
-            /// </summary>
-            /// <remarks>
-            /// Restores a web app.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='subscriptionName'>
-            /// Azure subscription.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of web app.
-            /// </param>
-            /// <param name='migrationOptions'>
-            /// Migration migrationOptions.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<StorageMigrationResponse> MigrateStorageAsync(this IWebAppsOperations operations, string subscriptionName, string resourceGroupName, string name, StorageMigrationOptions migrationOptions, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.MigrateStorageWithHttpMessagesAsync(subscriptionName, resourceGroupName, name, migrationOptions, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Migrates a local (in-app) MySql database to a remote MySql database.
-            /// </summary>
-            /// <remarks>
-            /// Migrates a local (in-app) MySql database to a remote MySql database.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of web app.
-            /// </param>
-            /// <param name='migrationRequestEnvelope'>
-            /// MySql migration options.
+            /// <param name='migrationRequestEnvelope'>
+            /// MySql migration options.
             /// </param>
             public static Operation MigrateMySql(this IWebAppsOperations operations, string resourceGroupName, string name, MigrateMySqlRequest migrationRequestEnvelope)
             {
@@ -5324,7 +5307,8 @@ public static Operation MigrateMySql(this IWebAppsOperations operations, string
             /// Migrates a local (in-app) MySql database to a remote MySql database.
             /// </summary>
             /// <remarks>
-            /// Migrates a local (in-app) MySql database to a remote MySql database.
+            /// Description for Migrates a local (in-app) MySql database to a remote MySql
+            /// database.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5354,8 +5338,8 @@ public static Operation MigrateMySql(this IWebAppsOperations operations, string
             /// or not MySql in app is enabled
             /// </summary>
             /// <remarks>
-            /// Returns the status of MySql in app migration, if one is active, and whether
-            /// or not MySql in app is enabled
+            /// Description for Returns the status of MySql in app migration, if one is
+            /// active, and whether or not MySql in app is enabled
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5376,8 +5360,8 @@ public static MigrateMySqlStatus GetMigrateMySqlStatus(this IWebAppsOperations o
             /// or not MySql in app is enabled
             /// </summary>
             /// <remarks>
-            /// Returns the status of MySql in app migration, if one is active, and whether
-            /// or not MySql in app is enabled
+            /// Description for Returns the status of MySql in app migration, if one is
+            /// active, and whether or not MySql in app is enabled
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5403,7 +5387,7 @@ public static MigrateMySqlStatus GetMigrateMySqlStatus(this IWebAppsOperations o
             /// Gets a Swift Virtual Network connection.
             /// </summary>
             /// <remarks>
-            /// Gets a Swift Virtual Network connection.
+            /// Description for Gets a Swift Virtual Network connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5423,7 +5407,7 @@ public static SwiftVirtualNetwork GetSwiftVirtualNetworkConnection(this IWebApps
             /// Gets a Swift Virtual Network connection.
             /// </summary>
             /// <remarks>
-            /// Gets a Swift Virtual Network connection.
+            /// Description for Gets a Swift Virtual Network connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5452,9 +5436,10 @@ public static SwiftVirtualNetwork GetSwiftVirtualNetworkConnection(this IWebApps
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -5481,9 +5466,10 @@ public static SwiftVirtualNetwork CreateOrUpdateSwiftVirtualNetworkConnection(th
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -5514,8 +5500,8 @@ public static SwiftVirtualNetwork CreateOrUpdateSwiftVirtualNetworkConnection(th
             /// slot).
             /// </summary>
             /// <remarks>
-            /// Deletes a Swift Virtual Network connection from an app (or deployment
-            /// slot).
+            /// Description for Deletes a Swift Virtual Network connection from an app (or
+            /// deployment slot).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5536,8 +5522,8 @@ public static void DeleteSwiftVirtualNetwork(this IWebAppsOperations operations,
             /// slot).
             /// </summary>
             /// <remarks>
-            /// Deletes a Swift Virtual Network connection from an app (or deployment
-            /// slot).
+            /// Description for Deletes a Swift Virtual Network connection from an app (or
+            /// deployment slot).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5563,9 +5549,10 @@ public static void DeleteSwiftVirtualNetwork(this IWebAppsOperations operations,
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -5592,9 +5579,10 @@ public static SwiftVirtualNetwork UpdateSwiftVirtualNetworkConnection(this IWebA
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -5625,8 +5613,8 @@ public static SwiftVirtualNetwork UpdateSwiftVirtualNetworkConnection(this IWebA
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets all network features used by the app (or deployment slot, if
-            /// specified).
+            /// Description for Gets all network features used by the app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5650,8 +5638,8 @@ public static NetworkFeatures ListNetworkFeatures(this IWebAppsOperations operat
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets all network features used by the app (or deployment slot, if
-            /// specified).
+            /// Description for Gets all network features used by the app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5681,8 +5669,8 @@ public static NetworkFeatures ListNetworkFeatures(this IWebAppsOperations operat
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5706,8 +5694,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5736,7 +5724,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// Start capturing network packets for the site (To be deprecated).
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site (To be deprecated).
+            /// Description for Start capturing network packets for the site (To be
+            /// deprecated).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5765,7 +5754,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// Start capturing network packets for the site (To be deprecated).
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site (To be deprecated).
+            /// Description for Start capturing network packets for the site (To be
+            /// deprecated).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5800,7 +5790,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5829,7 +5819,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5864,7 +5854,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperation(this IWebAppsOperatio
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5884,7 +5874,7 @@ public static void StopWebSiteNetworkTrace(this IWebAppsOperations operations, s
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5908,8 +5898,8 @@ public static void StopWebSiteNetworkTrace(this IWebAppsOperations operations, s
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5933,8 +5923,8 @@ public static IList<NetworkTrace> GetNetworkTraces(this IWebAppsOperations opera
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5964,8 +5954,8 @@ public static IList<NetworkTrace> GetNetworkTraces(this IWebAppsOperations opera
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -5989,8 +5979,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationV2(this IWebAppsOperat
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6020,8 +6010,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationV2(this IWebAppsOperat
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6045,8 +6035,8 @@ public static IList<NetworkTrace> GetNetworkTracesV2(this IWebAppsOperations ope
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6076,8 +6066,8 @@ public static IList<NetworkTrace> GetNetworkTracesV2(this IWebAppsOperations ope
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Generates a new publishing password for an app (or deployment slot, if
-            /// specified).
+            /// Description for Generates a new publishing password for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6098,8 +6088,8 @@ public static void GenerateNewSitePublishingPassword(this IWebAppsOperations ope
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Generates a new publishing password for an app (or deployment slot, if
-            /// specified).
+            /// Description for Generates a new publishing password for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6122,7 +6112,7 @@ public static void GenerateNewSitePublishingPassword(this IWebAppsOperations ope
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6148,7 +6138,7 @@ public static void GenerateNewSitePublishingPassword(this IWebAppsOperations ope
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6180,7 +6170,7 @@ public static void GenerateNewSitePublishingPassword(this IWebAppsOperations ope
             /// Gets web app's event logs.
             /// </summary>
             /// <remarks>
-            /// Gets web app's event logs.
+            /// Description for Gets web app's event logs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6200,7 +6190,7 @@ public static SitePhpErrorLogFlag GetSitePhpErrorLogFlag(this IWebAppsOperations
             /// Gets web app's event logs.
             /// </summary>
             /// <remarks>
-            /// Gets web app's event logs.
+            /// Description for Gets web app's event logs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6226,7 +6216,7 @@ public static SitePhpErrorLogFlag GetSitePhpErrorLogFlag(this IWebAppsOperations
             /// Gets the premier add-ons of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the premier add-ons of an app.
+            /// Description for Gets the premier add-ons of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6246,7 +6236,7 @@ public static PremierAddOn ListPremierAddOns(this IWebAppsOperations operations,
             /// Gets the premier add-ons of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the premier add-ons of an app.
+            /// Description for Gets the premier add-ons of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6272,7 +6262,7 @@ public static PremierAddOn ListPremierAddOns(this IWebAppsOperations operations,
             /// Gets a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Gets a named add-on of an app.
+            /// Description for Gets a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6295,7 +6285,7 @@ public static PremierAddOn GetPremierAddOn(this IWebAppsOperations operations, s
             /// Gets a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Gets a named add-on of an app.
+            /// Description for Gets a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6324,7 +6314,7 @@ public static PremierAddOn GetPremierAddOn(this IWebAppsOperations operations, s
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6350,7 +6340,7 @@ public static PremierAddOn AddPremierAddOn(this IWebAppsOperations operations, s
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6382,7 +6372,7 @@ public static PremierAddOn AddPremierAddOn(this IWebAppsOperations operations, s
             /// Delete a premier add-on from an app.
             /// </summary>
             /// <remarks>
-            /// Delete a premier add-on from an app.
+            /// Description for Delete a premier add-on from an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6405,7 +6395,7 @@ public static void DeletePremierAddOn(this IWebAppsOperations operations, string
             /// Delete a premier add-on from an app.
             /// </summary>
             /// <remarks>
-            /// Delete a premier add-on from an app.
+            /// Description for Delete a premier add-on from an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6431,7 +6421,7 @@ public static void DeletePremierAddOn(this IWebAppsOperations operations, string
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6457,7 +6447,7 @@ public static PremierAddOn UpdatePremierAddOn(this IWebAppsOperations operations
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6490,8 +6480,8 @@ public static PremierAddOn UpdatePremierAddOn(this IWebAppsOperations operations
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Gets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Gets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6512,8 +6502,8 @@ public static PrivateAccess GetPrivateAccess(this IWebAppsOperations operations,
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Gets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Gets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6540,8 +6530,8 @@ public static PrivateAccess GetPrivateAccess(this IWebAppsOperations operations,
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Sets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Sets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6565,8 +6555,8 @@ public static PrivateAccess PutPrivateAccessVnet(this IWebAppsOperations operati
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Sets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Sets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6596,8 +6586,8 @@ public static PrivateAccess PutPrivateAccessVnet(this IWebAppsOperations operati
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6618,8 +6608,8 @@ public static IPage<ProcessInfo> ListProcesses(this IWebAppsOperations operation
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6646,8 +6636,8 @@ public static IPage<ProcessInfo> ListProcesses(this IWebAppsOperations operation
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6671,8 +6661,8 @@ public static ProcessInfo GetProcess(this IWebAppsOperations operations, string
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6702,8 +6692,8 @@ public static ProcessInfo GetProcess(this IWebAppsOperations operations, string
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6727,8 +6717,8 @@ public static void DeleteProcess(this IWebAppsOperations operations, string reso
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6755,8 +6745,8 @@ public static void DeleteProcess(this IWebAppsOperations operations, string reso
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6780,8 +6770,8 @@ public static Stream GetProcessDump(this IWebAppsOperations operations, string r
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6810,8 +6800,8 @@ public static Stream GetProcessDump(this IWebAppsOperations operations, string r
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6835,8 +6825,8 @@ public static IPage<ProcessModuleInfo> ListProcessModules(this IWebAppsOperation
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6866,8 +6856,8 @@ public static IPage<ProcessModuleInfo> ListProcessModules(this IWebAppsOperation
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6894,8 +6884,8 @@ public static ProcessModuleInfo GetProcessModule(this IWebAppsOperations operati
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6928,8 +6918,8 @@ public static ProcessModuleInfo GetProcessModule(this IWebAppsOperations operati
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6953,8 +6943,8 @@ public static IPage<ProcessThreadInfo> ListProcessThreads(this IWebAppsOperation
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6980,12 +6970,10 @@ public static IPage<ProcessThreadInfo> ListProcessThreads(this IWebAppsOperation
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -6994,26 +6982,18 @@ public static IPage<ProcessThreadInfo> ListProcessThreads(this IWebAppsOperation
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='threadId'>
-            /// TID.
+            /// Name of the app.
             /// </param>
-            public static ProcessThreadInfo GetProcessThread(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId)
+            public static IPage<PublicCertificate> ListPublicCertificates(this IWebAppsOperations operations, string resourceGroupName, string name)
             {
-                return operations.GetProcessThreadAsync(resourceGroupName, name, processId, threadId).GetAwaiter().GetResult();
+                return operations.ListPublicCertificatesAsync(resourceGroupName, name).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7022,30 +7002,26 @@ public static ProcessThreadInfo GetProcessThread(this IWebAppsOperations operati
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='threadId'>
-            /// TID.
+            /// Name of the app.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProcessThreadInfo> GetProcessThreadAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<PublicCertificate>> ListPublicCertificatesAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetProcessThreadWithHttpMessagesAsync(resourceGroupName, name, processId, threadId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListPublicCertificatesWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get public certificates for an app or a deployment slot.
+            /// Get the named public certificate for an app (or deployment slot, if
+            /// specified).
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get the named public certificate for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7056,69 +7032,21 @@ public static ProcessThreadInfo GetProcessThread(this IWebAppsOperations operati
             /// <param name='name'>
             /// Name of the app.
             /// </param>
-            public static IPage<PublicCertificate> ListPublicCertificates(this IWebAppsOperations operations, string resourceGroupName, string name)
+            /// <param name='publicCertificateName'>
+            /// Public certificate name.
+            /// </param>
+            public static PublicCertificate GetPublicCertificate(this IWebAppsOperations operations, string resourceGroupName, string name, string publicCertificateName)
             {
-                return operations.ListPublicCertificatesAsync(resourceGroupName, name).GetAwaiter().GetResult();
+                return operations.GetPublicCertificateAsync(resourceGroupName, name, publicCertificateName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get public certificates for an app or a deployment slot.
+            /// Get the named public certificate for an app (or deployment slot, if
+            /// specified).
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<PublicCertificate>> ListPublicCertificatesAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListPublicCertificatesWithHttpMessagesAsync(resourceGroupName, name, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
-            /// </summary>
-            /// <remarks>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='publicCertificateName'>
-            /// Public certificate name.
-            /// </param>
-            public static PublicCertificate GetPublicCertificate(this IWebAppsOperations operations, string resourceGroupName, string name, string publicCertificateName)
-            {
-                return operations.GetPublicCertificateAsync(resourceGroupName, name, publicCertificateName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
-            /// </summary>
-            /// <remarks>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named public certificate for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7147,7 +7075,7 @@ public static PublicCertificate GetPublicCertificate(this IWebAppsOperations ope
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7174,7 +7102,7 @@ public static PublicCertificate CreateOrUpdatePublicCertificate(this IWebAppsOpe
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7207,7 +7135,7 @@ public static PublicCertificate CreateOrUpdatePublicCertificate(this IWebAppsOpe
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7230,7 +7158,7 @@ public static void DeletePublicCertificate(this IWebAppsOperations operations, s
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7256,7 +7184,8 @@ public static void DeletePublicCertificate(this IWebAppsOperations operations, s
             /// Gets the publishing profile for an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Gets the publishing profile for an app (or deployment slot, if specified).
+            /// Description for Gets the publishing profile for an app (or deployment slot,
+            /// if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7280,7 +7209,8 @@ public static Stream ListPublishingProfileXmlWithSecrets(this IWebAppsOperations
             /// Gets the publishing profile for an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Gets the publishing profile for an app (or deployment slot, if specified).
+            /// Description for Gets the publishing profile for an app (or deployment slot,
+            /// if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7310,8 +7240,8 @@ public static Stream ListPublishingProfileXmlWithSecrets(this IWebAppsOperations
             /// previously modified by calling the API with POST.
             /// </summary>
             /// <remarks>
-            /// Resets the configuration settings of the current slot if they were
-            /// previously modified by calling the API with POST.
+            /// Description for Resets the configuration settings of the current slot if
+            /// they were previously modified by calling the API with POST.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7332,8 +7262,8 @@ public static void ResetProductionSlotConfig(this IWebAppsOperations operations,
             /// previously modified by calling the API with POST.
             /// </summary>
             /// <remarks>
-            /// Resets the configuration settings of the current slot if they were
-            /// previously modified by calling the API with POST.
+            /// Description for Resets the configuration settings of the current slot if
+            /// they were previously modified by calling the API with POST.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7356,7 +7286,7 @@ public static void ResetProductionSlotConfig(this IWebAppsOperations operations,
             /// Restarts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Restarts an app (or deployment slot, if specified).
+            /// Description for Restarts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7384,7 +7314,7 @@ public static void ResetProductionSlotConfig(this IWebAppsOperations operations,
             /// Restarts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Restarts an app (or deployment slot, if specified).
+            /// Description for Restarts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7415,7 +7345,7 @@ public static void ResetProductionSlotConfig(this IWebAppsOperations operations,
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7438,7 +7368,7 @@ public static void RestoreFromBackupBlob(this IWebAppsOperations operations, str
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7464,7 +7394,7 @@ public static void RestoreFromBackupBlob(this IWebAppsOperations operations, str
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7487,7 +7417,7 @@ public static void RestoreFromDeletedApp(this IWebAppsOperations operations, str
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7513,7 +7443,7 @@ public static void RestoreFromDeletedApp(this IWebAppsOperations operations, str
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7537,7 +7467,7 @@ public static void RestoreSnapshot(this IWebAppsOperations operations, string re
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7564,7 +7494,8 @@ public static void RestoreSnapshot(this IWebAppsOperations operations, string re
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7584,7 +7515,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensions(this IWebAppsOperation
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7611,8 +7543,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensions(this IWebAppsOperation
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Get site extension information by its ID for a web site, or a deployment
-            /// slot.
+            /// Description for Get site extension information by its ID for a web site, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7636,8 +7568,8 @@ public static SiteExtensionInfo GetSiteExtension(this IWebAppsOperations operati
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Get site extension information by its ID for a web site, or a deployment
-            /// slot.
+            /// Description for Get site extension information by its ID for a web site, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7666,7 +7598,7 @@ public static SiteExtensionInfo GetSiteExtension(this IWebAppsOperations operati
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7689,7 +7621,7 @@ public static SiteExtensionInfo InstallSiteExtension(this IWebAppsOperations ope
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7718,7 +7650,8 @@ public static SiteExtensionInfo InstallSiteExtension(this IWebAppsOperations ope
             /// Remove a site extension from a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Remove a site extension from a web site, or a deployment slot.
+            /// Description for Remove a site extension from a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7741,7 +7674,8 @@ public static void DeleteSiteExtension(this IWebAppsOperations operations, strin
             /// Remove a site extension from a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Remove a site extension from a web site, or a deployment slot.
+            /// Description for Remove a site extension from a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7764,10 +7698,63 @@ public static void DeleteSiteExtension(this IWebAppsOperations operations, strin
             }
 
             /// <summary>
-            /// Gets an app's deployment slots.
+            /// Copies a deployment slot to another deployment slot of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            public static void CopyProductionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity)
+            {
+                operations.CopyProductionSlotAsync(resourceGroupName, name, copySlotEntity).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Copies a deployment slot to another deployment slot of an app.
             /// </summary>
             /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task CopyProductionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                (await operations.CopyProductionSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, null, cancellationToken).ConfigureAwait(false)).Dispose();
+            }
+
+            /// <summary>
             /// Gets an app's deployment slots.
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets an app's deployment slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7787,7 +7774,7 @@ public static IPage<Site> ListSlots(this IWebAppsOperations operations, string r
             /// Gets an app's deployment slots.
             /// </summary>
             /// <remarks>
-            /// Gets an app's deployment slots.
+            /// Description for Gets an app's deployment slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7813,7 +7800,7 @@ public static IPage<Site> ListSlots(this IWebAppsOperations operations, string r
             /// Gets the details of a web, mobile, or API app.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a web, mobile, or API app.
+            /// Description for Gets the details of a web, mobile, or API app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7837,7 +7824,7 @@ public static Site GetSlot(this IWebAppsOperations operations, string resourceGr
             /// Gets the details of a web, mobile, or API app.
             /// </summary>
             /// <remarks>
-            /// Gets the details of a web, mobile, or API app.
+            /// Description for Gets the details of a web, mobile, or API app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7868,8 +7855,8 @@ public static Site GetSlot(this IWebAppsOperations operations, string resourceGr
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7898,8 +7885,8 @@ public static Site CreateOrUpdateSlot(this IWebAppsOperations operations, string
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7933,7 +7920,8 @@ public static Site CreateOrUpdateSlot(this IWebAppsOperations operations, string
             /// Deletes a web, mobile, or API app, or one of the deployment slots.
             /// </summary>
             /// <remarks>
-            /// Deletes a web, mobile, or API app, or one of the deployment slots.
+            /// Description for Deletes a web, mobile, or API app, or one of the deployment
+            /// slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -7965,7 +7953,8 @@ public static Site CreateOrUpdateSlot(this IWebAppsOperations operations, string
             /// Deletes a web, mobile, or API app, or one of the deployment slots.
             /// </summary>
             /// <remarks>
-            /// Deletes a web, mobile, or API app, or one of the deployment slots.
+            /// Description for Deletes a web, mobile, or API app, or one of the deployment
+            /// slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8001,8 +7990,8 @@ public static Site CreateOrUpdateSlot(this IWebAppsOperations operations, string
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8031,8 +8020,8 @@ public static Site UpdateSlot(this IWebAppsOperations operations, string resourc
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8066,7 +8055,7 @@ public static Site UpdateSlot(this IWebAppsOperations operations, string resourc
             /// Analyze a custom hostname.
             /// </summary>
             /// <remarks>
-            /// Analyze a custom hostname.
+            /// Description for Analyze a custom hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8093,7 +8082,7 @@ public static Site UpdateSlot(this IWebAppsOperations operations, string resourc
             /// Analyze a custom hostname.
             /// </summary>
             /// <remarks>
-            /// Analyze a custom hostname.
+            /// Description for Analyze a custom hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8127,8 +8116,8 @@ public static Site UpdateSlot(this IWebAppsOperations operations, string resourc
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Applies the configuration settings from the target slot onto the current
-            /// slot.
+            /// Description for Applies the configuration settings from the target slot
+            /// onto the current slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8156,8 +8145,8 @@ public static void ApplySlotConfigurationSlot(this IWebAppsOperations operations
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Applies the configuration settings from the target slot onto the current
-            /// slot.
+            /// Description for Applies the configuration settings from the target slot
+            /// onto the current slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8187,7 +8176,7 @@ public static void ApplySlotConfigurationSlot(this IWebAppsOperations operations
             /// Creates a backup of an app.
             /// </summary>
             /// <remarks>
-            /// Creates a backup of an app.
+            /// Description for Creates a backup of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8215,7 +8204,7 @@ public static BackupItem BackupSlot(this IWebAppsOperations operations, string r
             /// Creates a backup of an app.
             /// </summary>
             /// <remarks>
-            /// Creates a backup of an app.
+            /// Description for Creates a backup of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8249,7 +8238,7 @@ public static BackupItem BackupSlot(this IWebAppsOperations operations, string r
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8273,7 +8262,7 @@ public static IPage<BackupItem> ListBackupsSlot(this IWebAppsOperations operatio
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8303,7 +8292,7 @@ public static IPage<BackupItem> ListBackupsSlot(this IWebAppsOperations operatio
             /// Gets a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Gets a backup of an app by its ID.
+            /// Description for Gets a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8330,7 +8319,7 @@ public static BackupItem GetBackupStatusSlot(this IWebAppsOperations operations,
             /// Gets a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Gets a backup of an app by its ID.
+            /// Description for Gets a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8363,7 +8352,7 @@ public static BackupItem GetBackupStatusSlot(this IWebAppsOperations operations,
             /// Deletes a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Deletes a backup of an app by its ID.
+            /// Description for Deletes a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8390,7 +8379,7 @@ public static void DeleteBackupSlot(this IWebAppsOperations operations, string r
             /// Deletes a backup of an app by its ID.
             /// </summary>
             /// <remarks>
-            /// Deletes a backup of an app by its ID.
+            /// Description for Deletes a backup of an app by its ID.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8423,10 +8412,10 @@ public static void DeleteBackupSlot(this IWebAppsOperations operations, string r
             /// request body.
             /// </summary>
             /// <remarks>
-            /// Gets status of a web app backup that may be in progress, including secrets
-            /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-            /// used to update the SAS URL for the backup if a new URL is passed in the
-            /// request body.
+            /// Description for Gets status of a web app backup that may be in progress,
+            /// including secrets associated with the backup, such as the Azure Storage SAS
+            /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+            /// passed in the request body.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8459,10 +8448,10 @@ public static BackupItem ListBackupStatusSecretsSlot(this IWebAppsOperations ope
             /// request body.
             /// </summary>
             /// <remarks>
-            /// Gets status of a web app backup that may be in progress, including secrets
-            /// associated with the backup, such as the Azure Storage SAS URL. Also can be
-            /// used to update the SAS URL for the backup if a new URL is passed in the
-            /// request body.
+            /// Description for Gets status of a web app backup that may be in progress,
+            /// including secrets associated with the backup, such as the Azure Storage SAS
+            /// URL. Also can be used to update the SAS URL for the backup if a new URL is
+            /// passed in the request body.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8499,8 +8488,8 @@ public static BackupItem ListBackupStatusSecretsSlot(this IWebAppsOperations ope
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8531,8 +8520,8 @@ public static void RestoreSlot(this IWebAppsOperations operations, string resour
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8565,7 +8554,7 @@ public static void RestoreSlot(this IWebAppsOperations operations, string resour
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8589,7 +8578,7 @@ public static IPage<SiteConfigResource> ListConfigurationsSlot(this IWebAppsOper
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8619,7 +8608,7 @@ public static IPage<SiteConfigResource> ListConfigurationsSlot(this IWebAppsOper
             /// Replaces the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the application settings of an app.
+            /// Description for Replaces the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8646,7 +8635,7 @@ public static StringDictionary UpdateApplicationSettingsSlot(this IWebAppsOperat
             /// Replaces the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the application settings of an app.
+            /// Description for Replaces the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8679,7 +8668,7 @@ public static StringDictionary UpdateApplicationSettingsSlot(this IWebAppsOperat
             /// Gets the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the application settings of an app.
+            /// Description for Gets the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8703,7 +8692,7 @@ public static StringDictionary ListApplicationSettingsSlot(this IWebAppsOperatio
             /// Gets the application settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the application settings of an app.
+            /// Description for Gets the application settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8734,8 +8723,8 @@ public static StringDictionary ListApplicationSettingsSlot(this IWebAppsOperatio
             /// app.
             /// </summary>
             /// <remarks>
-            /// Updates the Authentication / Authorization settings associated with web
-            /// app.
+            /// Description for Updates the Authentication / Authorization settings
+            /// associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8763,8 +8752,8 @@ public static SiteAuthSettings UpdateAuthSettingsSlot(this IWebAppsOperations op
             /// app.
             /// </summary>
             /// <remarks>
-            /// Updates the Authentication / Authorization settings associated with web
-            /// app.
+            /// Description for Updates the Authentication / Authorization settings
+            /// associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8797,7 +8786,7 @@ public static SiteAuthSettings UpdateAuthSettingsSlot(this IWebAppsOperations op
             /// Gets the Authentication/Authorization settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Authentication/Authorization settings of an app.
+            /// Description for Gets the Authentication/Authorization settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8821,7 +8810,7 @@ public static SiteAuthSettings GetAuthSettingsSlot(this IWebAppsOperations opera
             /// Gets the Authentication/Authorization settings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Authentication/Authorization settings of an app.
+            /// Description for Gets the Authentication/Authorization settings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8851,7 +8840,7 @@ public static SiteAuthSettings GetAuthSettingsSlot(this IWebAppsOperations opera
             /// Updates the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the Azure storage account configurations of an app.
+            /// Description for Updates the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8878,7 +8867,7 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccountsS
             /// Updates the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the Azure storage account configurations of an app.
+            /// Description for Updates the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8911,7 +8900,7 @@ public static AzureStoragePropertyDictionaryResource UpdateAzureStorageAccountsS
             /// Gets the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Azure storage account configurations of an app.
+            /// Description for Gets the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8935,7 +8924,7 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccountsSlo
             /// Gets the Azure storage account configurations of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Azure storage account configurations of an app.
+            /// Description for Gets the Azure storage account configurations of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8965,7 +8954,7 @@ public static AzureStoragePropertyDictionaryResource ListAzureStorageAccountsSlo
             /// Updates the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the backup configuration of an app.
+            /// Description for Updates the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -8992,7 +8981,7 @@ public static BackupRequest UpdateBackupConfigurationSlot(this IWebAppsOperation
             /// Updates the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the backup configuration of an app.
+            /// Description for Updates the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9025,7 +9014,7 @@ public static BackupRequest UpdateBackupConfigurationSlot(this IWebAppsOperation
             /// Deletes the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the backup configuration of an app.
+            /// Description for Deletes the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9049,7 +9038,7 @@ public static void DeleteBackupConfigurationSlot(this IWebAppsOperations operati
             /// Deletes the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the backup configuration of an app.
+            /// Description for Deletes the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9076,7 +9065,7 @@ public static void DeleteBackupConfigurationSlot(this IWebAppsOperations operati
             /// Gets the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the backup configuration of an app.
+            /// Description for Gets the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9100,7 +9089,7 @@ public static BackupRequest GetBackupConfigurationSlot(this IWebAppsOperations o
             /// Gets the backup configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the backup configuration of an app.
+            /// Description for Gets the backup configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9130,7 +9119,7 @@ public static BackupRequest GetBackupConfigurationSlot(this IWebAppsOperations o
             /// Replaces the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the connection strings of an app.
+            /// Description for Replaces the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9157,7 +9146,7 @@ public static ConnectionStringDictionary UpdateConnectionStringsSlot(this IWebAp
             /// Replaces the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the connection strings of an app.
+            /// Description for Replaces the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9190,7 +9179,7 @@ public static ConnectionStringDictionary UpdateConnectionStringsSlot(this IWebAp
             /// Gets the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the connection strings of an app.
+            /// Description for Gets the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9214,7 +9203,7 @@ public static ConnectionStringDictionary ListConnectionStringsSlot(this IWebApps
             /// Gets the connection strings of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the connection strings of an app.
+            /// Description for Gets the connection strings of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9244,7 +9233,7 @@ public static ConnectionStringDictionary ListConnectionStringsSlot(this IWebApps
             /// Gets the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the logging configuration of an app.
+            /// Description for Gets the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9268,7 +9257,7 @@ public static SiteLogsConfig GetDiagnosticLogsConfigurationSlot(this IWebAppsOpe
             /// Gets the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the logging configuration of an app.
+            /// Description for Gets the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9298,7 +9287,7 @@ public static SiteLogsConfig GetDiagnosticLogsConfigurationSlot(this IWebAppsOpe
             /// Updates the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the logging configuration of an app.
+            /// Description for Updates the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9326,7 +9315,7 @@ public static SiteLogsConfig UpdateDiagnosticLogsConfigSlot(this IWebAppsOperati
             /// Updates the logging configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the logging configuration of an app.
+            /// Description for Updates the logging configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9360,7 +9349,7 @@ public static SiteLogsConfig UpdateDiagnosticLogsConfigSlot(this IWebAppsOperati
             /// Replaces the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the metadata of an app.
+            /// Description for Replaces the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9387,7 +9376,7 @@ public static StringDictionary UpdateMetadataSlot(this IWebAppsOperations operat
             /// Replaces the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Replaces the metadata of an app.
+            /// Description for Replaces the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9420,7 +9409,7 @@ public static StringDictionary UpdateMetadataSlot(this IWebAppsOperations operat
             /// Gets the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the metadata of an app.
+            /// Description for Gets the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9444,7 +9433,7 @@ public static StringDictionary ListMetadataSlot(this IWebAppsOperations operatio
             /// Gets the metadata of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the metadata of an app.
+            /// Description for Gets the metadata of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9474,7 +9463,7 @@ public static StringDictionary ListMetadataSlot(this IWebAppsOperations operatio
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9498,7 +9487,7 @@ public static User ListPublishingCredentialsSlot(this IWebAppsOperations operati
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9528,7 +9517,7 @@ public static User ListPublishingCredentialsSlot(this IWebAppsOperations operati
             /// Updates the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Updates the Push settings associated with web app.
+            /// Description for Updates the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9555,7 +9544,7 @@ public static PushSettings UpdateSitePushSettingsSlot(this IWebAppsOperations op
             /// Updates the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Updates the Push settings associated with web app.
+            /// Description for Updates the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9588,7 +9577,7 @@ public static PushSettings UpdateSitePushSettingsSlot(this IWebAppsOperations op
             /// Gets the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Gets the Push settings associated with web app.
+            /// Description for Gets the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9612,7 +9601,7 @@ public static PushSettings ListSitePushSettingsSlot(this IWebAppsOperations oper
             /// Gets the Push settings associated with web app.
             /// </summary>
             /// <remarks>
-            /// Gets the Push settings associated with web app.
+            /// Description for Gets the Push settings associated with web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9643,8 +9632,8 @@ public static PushSettings ListSitePushSettingsSlot(this IWebAppsOperations oper
             /// default documents, virtual applications, Always On, etc.
             /// </summary>
             /// <remarks>
-            /// Gets the configuration of an app, such as platform version and bitness,
-            /// default documents, virtual applications, Always On, etc.
+            /// Description for Gets the configuration of an app, such as platform version
+            /// and bitness, default documents, virtual applications, Always On, etc.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9669,8 +9658,8 @@ public static SiteConfigResource GetConfigurationSlot(this IWebAppsOperations op
             /// default documents, virtual applications, Always On, etc.
             /// </summary>
             /// <remarks>
-            /// Gets the configuration of an app, such as platform version and bitness,
-            /// default documents, virtual applications, Always On, etc.
+            /// Description for Gets the configuration of an app, such as platform version
+            /// and bitness, default documents, virtual applications, Always On, etc.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9700,7 +9689,7 @@ public static SiteConfigResource GetConfigurationSlot(this IWebAppsOperations op
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9727,7 +9716,7 @@ public static SiteConfigResource CreateOrUpdateConfigurationSlot(this IWebAppsOp
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9760,7 +9749,7 @@ public static SiteConfigResource CreateOrUpdateConfigurationSlot(this IWebAppsOp
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9787,7 +9776,7 @@ public static SiteConfigResource UpdateConfigurationSlot(this IWebAppsOperations
             /// Updates the configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the configuration of an app.
+            /// Description for Updates the configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9821,8 +9810,8 @@ public static SiteConfigResource UpdateConfigurationSlot(this IWebAppsOperations
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9847,8 +9836,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9878,7 +9867,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// Gets a snapshot of the configuration of an app at a previous point in time.
             /// </summary>
             /// <remarks>
-            /// Gets a snapshot of the configuration of an app at a previous point in time.
+            /// Description for Gets a snapshot of the configuration of an app at a
+            /// previous point in time.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9905,7 +9895,8 @@ public static SiteConfigResource GetConfigurationSnapshotSlot(this IWebAppsOpera
             /// Gets a snapshot of the configuration of an app at a previous point in time.
             /// </summary>
             /// <remarks>
-            /// Gets a snapshot of the configuration of an app at a previous point in time.
+            /// Description for Gets a snapshot of the configuration of an app at a
+            /// previous point in time.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9938,7 +9929,7 @@ public static SiteConfigResource GetConfigurationSnapshotSlot(this IWebAppsOpera
             /// Reverts the configuration of an app to a previous snapshot.
             /// </summary>
             /// <remarks>
-            /// Reverts the configuration of an app to a previous snapshot.
+            /// Description for Reverts the configuration of an app to a previous snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9965,7 +9956,7 @@ public static void RecoverSiteConfigurationSnapshotSlot(this IWebAppsOperations
             /// Reverts the configuration of an app to a previous snapshot.
             /// </summary>
             /// <remarks>
-            /// Reverts the configuration of an app to a previous snapshot.
+            /// Description for Reverts the configuration of an app to a previous snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -9995,7 +9986,7 @@ public static void RecoverSiteConfigurationSnapshotSlot(this IWebAppsOperations
             /// Gets the last lines of docker logs for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the last lines of docker logs for the given site
+            /// Description for Gets the last lines of docker logs for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10019,7 +10010,7 @@ public static Stream GetWebSiteContainerLogsSlot(this IWebAppsOperations operati
             /// Gets the last lines of docker logs for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the last lines of docker logs for the given site
+            /// Description for Gets the last lines of docker logs for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10048,7 +10039,7 @@ public static Stream GetWebSiteContainerLogsSlot(this IWebAppsOperations operati
             /// Gets the ZIP archived docker log files for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the ZIP archived docker log files for the given site
+            /// Description for Gets the ZIP archived docker log files for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10072,7 +10063,7 @@ public static Stream GetContainerLogsZipSlot(this IWebAppsOperations operations,
             /// Gets the ZIP archived docker log files for the given site
             /// </summary>
             /// <remarks>
-            /// Gets the ZIP archived docker log files for the given site
+            /// Description for Gets the ZIP archived docker log files for the given site
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10101,7 +10092,7 @@ public static Stream GetContainerLogsZipSlot(this IWebAppsOperations operations,
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10125,7 +10116,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsSlot(this IWebAppsOpe
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10155,7 +10146,8 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsSlot(this IWebAppsOpe
             /// Gets a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10182,7 +10174,8 @@ public static ContinuousWebJob GetContinuousWebJobSlot(this IWebAppsOperations o
             /// Gets a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10215,7 +10208,8 @@ public static ContinuousWebJob GetContinuousWebJobSlot(this IWebAppsOperations o
             /// Delete a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10242,7 +10236,8 @@ public static void DeleteContinuousWebJobSlot(this IWebAppsOperations operations
             /// Delete a continuous web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a continuous web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a continuous web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10272,7 +10267,8 @@ public static void DeleteContinuousWebJobSlot(this IWebAppsOperations operations
             /// Start a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Start a continuous web job for an app, or a deployment slot.
+            /// Description for Start a continuous web job for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10299,7 +10295,8 @@ public static void StartContinuousWebJobSlot(this IWebAppsOperations operations,
             /// Start a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Start a continuous web job for an app, or a deployment slot.
+            /// Description for Start a continuous web job for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10329,7 +10326,7 @@ public static void StartContinuousWebJobSlot(this IWebAppsOperations operations,
             /// Stop a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Stop a continuous web job for an app, or a deployment slot.
+            /// Description for Stop a continuous web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10356,7 +10353,7 @@ public static void StopContinuousWebJobSlot(this IWebAppsOperations operations,
             /// Stop a continuous web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Stop a continuous web job for an app, or a deployment slot.
+            /// Description for Stop a continuous web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10386,7 +10383,7 @@ public static void StopContinuousWebJobSlot(this IWebAppsOperations operations,
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10410,7 +10407,7 @@ public static IPage<Deployment> ListDeploymentsSlot(this IWebAppsOperations oper
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10440,7 +10437,8 @@ public static IPage<Deployment> ListDeploymentsSlot(this IWebAppsOperations oper
             /// Get a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get a deployment by its ID for an app, or a deployment slot.
+            /// Description for Get a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10467,7 +10465,8 @@ public static Deployment GetDeploymentSlot(this IWebAppsOperations operations, s
             /// Get a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get a deployment by its ID for an app, or a deployment slot.
+            /// Description for Get a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10500,7 +10499,7 @@ public static Deployment GetDeploymentSlot(this IWebAppsOperations operations, s
             /// Create a deployment for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create a deployment for an app, or a deployment slot.
+            /// Description for Create a deployment for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10530,7 +10529,7 @@ public static Deployment CreateDeploymentSlot(this IWebAppsOperations operations
             /// Create a deployment for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create a deployment for an app, or a deployment slot.
+            /// Description for Create a deployment for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10566,7 +10565,8 @@ public static Deployment CreateDeploymentSlot(this IWebAppsOperations operations
             /// Delete a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a deployment by its ID for an app, or a deployment slot.
+            /// Description for Delete a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10593,7 +10593,8 @@ public static void DeleteDeploymentSlot(this IWebAppsOperations operations, stri
             /// Delete a deployment by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a deployment by its ID for an app, or a deployment slot.
+            /// Description for Delete a deployment by its ID for an app, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10624,8 +10625,8 @@ public static void DeleteDeploymentSlot(this IWebAppsOperations operations, stri
             /// slot.
             /// </summary>
             /// <remarks>
-            /// List deployment log for specific deployment for an app, or a deployment
-            /// slot.
+            /// Description for List deployment log for specific deployment for an app, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10654,8 +10655,8 @@ public static Deployment ListDeploymentLogSlot(this IWebAppsOperations operation
             /// slot.
             /// </summary>
             /// <remarks>
-            /// List deployment log for specific deployment for an app, or a deployment
-            /// slot.
+            /// Description for List deployment log for specific deployment for an app, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10691,9 +10692,9 @@ public static Deployment ListDeploymentLogSlot(this IWebAppsOperations operation
             /// backup.
             /// </summary>
             /// <remarks>
-            /// Discovers an existing app backup that can be restored from a blob in Azure
-            /// storage. Use this to get information about the databases stored in a
-            /// backup.
+            /// Description for Discovers an existing app backup that can be restored from
+            /// a blob in Azure storage. Use this to get information about the databases
+            /// stored in a backup.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10723,9 +10724,9 @@ public static RestoreRequest DiscoverBackupSlot(this IWebAppsOperations operatio
             /// backup.
             /// </summary>
             /// <remarks>
-            /// Discovers an existing app backup that can be restored from a blob in Azure
-            /// storage. Use this to get information about the databases stored in a
-            /// backup.
+            /// Description for Discovers an existing app backup that can be restored from
+            /// a blob in Azure storage. Use this to get information about the databases
+            /// stored in a backup.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10759,7 +10760,8 @@ public static RestoreRequest DiscoverBackupSlot(this IWebAppsOperations operatio
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10783,7 +10785,8 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersSlot(this IWebApps
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10813,7 +10816,7 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersSlot(this IWebApps
             /// Get domain ownership identifier for web app.
             /// </summary>
             /// <remarks>
-            /// Get domain ownership identifier for web app.
+            /// Description for Get domain ownership identifier for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10840,7 +10843,7 @@ public static Identifier GetDomainOwnershipIdentifierSlot(this IWebAppsOperation
             /// Get domain ownership identifier for web app.
             /// </summary>
             /// <remarks>
-            /// Get domain ownership identifier for web app.
+            /// Description for Get domain ownership identifier for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10874,8 +10877,8 @@ public static Identifier GetDomainOwnershipIdentifierSlot(this IWebAppsOperation
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10906,8 +10909,8 @@ public static Identifier CreateOrUpdateDomainOwnershipIdentifierSlot(this IWebAp
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10943,7 +10946,7 @@ public static Identifier CreateOrUpdateDomainOwnershipIdentifierSlot(this IWebAp
             /// Deletes a domain ownership identifier for a web app.
             /// </summary>
             /// <remarks>
-            /// Deletes a domain ownership identifier for a web app.
+            /// Description for Deletes a domain ownership identifier for a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -10970,7 +10973,7 @@ public static void DeleteDomainOwnershipIdentifierSlot(this IWebAppsOperations o
             /// Deletes a domain ownership identifier for a web app.
             /// </summary>
             /// <remarks>
-            /// Deletes a domain ownership identifier for a web app.
+            /// Description for Deletes a domain ownership identifier for a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11001,8 +11004,8 @@ public static void DeleteDomainOwnershipIdentifierSlot(this IWebAppsOperations o
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11033,8 +11036,8 @@ public static Identifier UpdateDomainOwnershipIdentifierSlot(this IWebAppsOperat
             /// ownership identifier.
             /// </summary>
             /// <remarks>
-            /// Creates a domain ownership identifier for web app, or updates an existing
-            /// ownership identifier.
+            /// Description for Creates a domain ownership identifier for web app, or
+            /// updates an existing ownership identifier.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11070,7 +11073,7 @@ public static Identifier UpdateDomainOwnershipIdentifierSlot(this IWebAppsOperat
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11094,7 +11097,7 @@ public static MSDeployStatus GetMSDeployStatusSlot(this IWebAppsOperations opera
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11124,7 +11127,7 @@ public static MSDeployStatus GetMSDeployStatusSlot(this IWebAppsOperations opera
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11151,7 +11154,7 @@ public static MSDeployStatus CreateMSDeployOperationSlot(this IWebAppsOperations
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11184,7 +11187,7 @@ public static MSDeployStatus CreateMSDeployOperationSlot(this IWebAppsOperations
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11208,7 +11211,7 @@ public static MSDeployLog GetMSDeployLogSlot(this IWebAppsOperations operations,
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11238,7 +11241,7 @@ public static MSDeployLog GetMSDeployLogSlot(this IWebAppsOperations operations,
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11250,8 +11253,7 @@ public static MSDeployLog GetMSDeployLogSlot(this IWebAppsOperations operations,
             /// Site name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             public static IPage<FunctionEnvelope> ListInstanceFunctionsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
             {
@@ -11262,7 +11264,7 @@ public static IPage<FunctionEnvelope> ListInstanceFunctionsSlot(this IWebAppsOpe
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11274,8 +11276,7 @@ public static IPage<FunctionEnvelope> ListInstanceFunctionsSlot(this IWebAppsOpe
             /// Site name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -11292,7 +11293,8 @@ public static IPage<FunctionEnvelope> ListInstanceFunctionsSlot(this IWebAppsOpe
             /// Fetch a short lived token that can be exchanged for a master key.
             /// </summary>
             /// <remarks>
-            /// Fetch a short lived token that can be exchanged for a master key.
+            /// Description for Fetch a short lived token that can be exchanged for a
+            /// master key.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11316,7 +11318,8 @@ public static string GetFunctionsAdminTokenSlot(this IWebAppsOperations operatio
             /// Fetch a short lived token that can be exchanged for a master key.
             /// </summary>
             /// <remarks>
-            /// Fetch a short lived token that can be exchanged for a master key.
+            /// Description for Fetch a short lived token that can be exchanged for a
+            /// master key.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11346,7 +11349,8 @@ public static string GetFunctionsAdminTokenSlot(this IWebAppsOperations operatio
             /// Get function information by its ID for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function information by its ID for web site, or a deployment slot.
+            /// Description for Get function information by its ID for web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11361,8 +11365,7 @@ public static string GetFunctionsAdminTokenSlot(this IWebAppsOperations operatio
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             public static FunctionEnvelope GetInstanceFunctionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string functionName, string slot)
             {
@@ -11373,7 +11376,8 @@ public static FunctionEnvelope GetInstanceFunctionSlot(this IWebAppsOperations o
             /// Get function information by its ID for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function information by its ID for web site, or a deployment slot.
+            /// Description for Get function information by its ID for web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11388,8 +11392,7 @@ public static FunctionEnvelope GetInstanceFunctionSlot(this IWebAppsOperations o
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -11406,7 +11409,7 @@ public static FunctionEnvelope GetInstanceFunctionSlot(this IWebAppsOperations o
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11421,8 +11424,7 @@ public static FunctionEnvelope GetInstanceFunctionSlot(this IWebAppsOperations o
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='functionEnvelope'>
             /// Function details.
@@ -11436,7 +11438,7 @@ public static FunctionEnvelope CreateInstanceFunctionSlot(this IWebAppsOperation
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11451,8 +11453,7 @@ public static FunctionEnvelope CreateInstanceFunctionSlot(this IWebAppsOperation
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='functionEnvelope'>
             /// Function details.
@@ -11472,7 +11473,7 @@ public static FunctionEnvelope CreateInstanceFunctionSlot(this IWebAppsOperation
             /// Delete a function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a function for web site, or a deployment slot.
+            /// Description for Delete a function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11487,8 +11488,7 @@ public static FunctionEnvelope CreateInstanceFunctionSlot(this IWebAppsOperation
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             public static void DeleteInstanceFunctionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string functionName, string slot)
             {
@@ -11499,7 +11499,7 @@ public static void DeleteInstanceFunctionSlot(this IWebAppsOperations operations
             /// Delete a function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a function for web site, or a deployment slot.
+            /// Description for Delete a function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11514,8 +11514,7 @@ public static void DeleteInstanceFunctionSlot(this IWebAppsOperations operations
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -11529,7 +11528,8 @@ public static void DeleteInstanceFunctionSlot(this IWebAppsOperations operations
             /// Get function secrets for a function in a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function secrets for a function in a web site, or a deployment slot.
+            /// Description for Get function secrets for a function in a web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11544,8 +11544,7 @@ public static void DeleteInstanceFunctionSlot(this IWebAppsOperations operations
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             public static FunctionSecrets ListFunctionSecretsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string functionName, string slot)
             {
@@ -11556,7 +11555,8 @@ public static FunctionSecrets ListFunctionSecretsSlot(this IWebAppsOperations op
             /// Get function secrets for a function in a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get function secrets for a function in a web site, or a deployment slot.
+            /// Description for Get function secrets for a function in a web site, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11571,8 +11571,7 @@ public static FunctionSecrets ListFunctionSecretsSlot(this IWebAppsOperations op
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -11589,7 +11588,7 @@ public static FunctionSecrets ListFunctionSecretsSlot(this IWebAppsOperations op
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11613,7 +11612,7 @@ public static IPage<HostNameBinding> ListHostNameBindingsSlot(this IWebAppsOpera
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11644,8 +11643,8 @@ public static IPage<HostNameBinding> ListHostNameBindingsSlot(this IWebAppsOpera
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named hostname binding for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named hostname binding for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11673,8 +11672,8 @@ public static HostNameBinding GetHostNameBindingSlot(this IWebAppsOperations ope
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named hostname binding for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named hostname binding for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11707,7 +11706,7 @@ public static HostNameBinding GetHostNameBindingSlot(this IWebAppsOperations ope
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11738,7 +11737,7 @@ public static HostNameBinding CreateOrUpdateHostNameBindingSlot(this IWebAppsOpe
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11775,7 +11774,7 @@ public static HostNameBinding CreateOrUpdateHostNameBindingSlot(this IWebAppsOpe
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11802,7 +11801,7 @@ public static void DeleteHostNameBindingSlot(this IWebAppsOperations operations,
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11832,7 +11831,8 @@ public static void DeleteHostNameBindingSlot(this IWebAppsOperations operations,
             /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+            /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+            /// this Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11861,7 +11861,8 @@ public static HybridConnection GetHybridConnectionSlot(this IWebAppsOperations o
             /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves a specific Service Bus Hybrid Connection used by this Web App.
+            /// Description for Retrieves a specific Service Bus Hybrid Connection used by
+            /// this Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11896,7 +11897,7 @@ public static HybridConnection GetHybridConnectionSlot(this IWebAppsOperations o
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11928,7 +11929,7 @@ public static HybridConnection CreateOrUpdateHybridConnectionSlot(this IWebAppsO
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11966,7 +11967,7 @@ public static HybridConnection CreateOrUpdateHybridConnectionSlot(this IWebAppsO
             /// Removes a Hybrid Connection from this site.
             /// </summary>
             /// <remarks>
-            /// Removes a Hybrid Connection from this site.
+            /// Description for Removes a Hybrid Connection from this site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -11995,7 +11996,7 @@ public static void DeleteHybridConnectionSlot(this IWebAppsOperations operations
             /// Removes a Hybrid Connection from this site.
             /// </summary>
             /// <remarks>
-            /// Removes a Hybrid Connection from this site.
+            /// Description for Removes a Hybrid Connection from this site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12027,7 +12028,7 @@ public static void DeleteHybridConnectionSlot(this IWebAppsOperations operations
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12059,7 +12060,7 @@ public static HybridConnection UpdateHybridConnectionSlot(this IWebAppsOperation
             /// Creates a new Hybrid Connection using a Service Bus relay.
             /// </summary>
             /// <remarks>
-            /// Creates a new Hybrid Connection using a Service Bus relay.
+            /// Description for Creates a new Hybrid Connection using a Service Bus relay.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12093,75 +12094,12 @@ public static HybridConnection UpdateHybridConnectionSlot(this IWebAppsOperation
                 }
             }
 
-            /// <summary>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </summary>
-            /// <remarks>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// The name of the web app.
-            /// </param>
-            /// <param name='namespaceName'>
-            /// The namespace for this hybrid connection.
-            /// </param>
-            /// <param name='relayName'>
-            /// The relay name for this hybrid connection.
-            /// </param>
-            /// <param name='slot'>
-            /// The name of the slot for the web app.
-            /// </param>
-            public static HybridConnectionKey ListHybridConnectionKeysSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string namespaceName, string relayName, string slot)
-            {
-                return operations.ListHybridConnectionKeysSlotAsync(resourceGroupName, name, namespaceName, relayName, slot).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </summary>
-            /// <remarks>
-            /// Gets the send key name and value for a Hybrid Connection.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// The name of the web app.
-            /// </param>
-            /// <param name='namespaceName'>
-            /// The namespace for this hybrid connection.
-            /// </param>
-            /// <param name='relayName'>
-            /// The relay name for this hybrid connection.
-            /// </param>
-            /// <param name='slot'>
-            /// The name of the slot for the web app.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<HybridConnectionKey> ListHybridConnectionKeysSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string namespaceName, string relayName, string slot, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListHybridConnectionKeysSlotWithHttpMessagesAsync(resourceGroupName, name, namespaceName, relayName, slot, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Retrieves all Service Bus Hybrid Connections used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+            /// Description for Retrieves all Service Bus Hybrid Connections used by this
+            /// Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12184,7 +12122,8 @@ public static HybridConnection ListHybridConnectionsSlot(this IWebAppsOperations
             /// Retrieves all Service Bus Hybrid Connections used by this Web App.
             /// </summary>
             /// <remarks>
-            /// Retrieves all Service Bus Hybrid Connections used by this Web App.
+            /// Description for Retrieves all Service Bus Hybrid Connections used by this
+            /// Web App.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12214,8 +12153,8 @@ public static HybridConnection ListHybridConnectionsSlot(this IWebAppsOperations
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets hybrid connections configured for an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets hybrid connections configured for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12240,8 +12179,8 @@ public static RelayServiceConnectionEntity ListRelayServiceConnectionsSlot(this
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets hybrid connections configured for an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets hybrid connections configured for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12271,7 +12210,7 @@ public static RelayServiceConnectionEntity ListRelayServiceConnectionsSlot(this
             /// Gets a hybrid connection configuration by its name.
             /// </summary>
             /// <remarks>
-            /// Gets a hybrid connection configuration by its name.
+            /// Description for Gets a hybrid connection configuration by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12298,7 +12237,7 @@ public static RelayServiceConnectionEntity GetRelayServiceConnectionSlot(this IW
             /// Gets a hybrid connection configuration by its name.
             /// </summary>
             /// <remarks>
-            /// Gets a hybrid connection configuration by its name.
+            /// Description for Gets a hybrid connection configuration by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12332,8 +12271,8 @@ public static RelayServiceConnectionEntity GetRelayServiceConnectionSlot(this IW
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12364,8 +12303,8 @@ public static RelayServiceConnectionEntity CreateOrUpdateRelayServiceConnectionS
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12401,7 +12340,7 @@ public static RelayServiceConnectionEntity CreateOrUpdateRelayServiceConnectionS
             /// Deletes a relay service connection by its name.
             /// </summary>
             /// <remarks>
-            /// Deletes a relay service connection by its name.
+            /// Description for Deletes a relay service connection by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12428,7 +12367,7 @@ public static void DeleteRelayServiceConnectionSlot(this IWebAppsOperations oper
             /// Deletes a relay service connection by its name.
             /// </summary>
             /// <remarks>
-            /// Deletes a relay service connection by its name.
+            /// Description for Deletes a relay service connection by its name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12459,8 +12398,8 @@ public static void DeleteRelayServiceConnectionSlot(this IWebAppsOperations oper
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12491,8 +12430,8 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnectionSlot(this
             /// one (PATCH).
             /// </summary>
             /// <remarks>
-            /// Creates a new hybrid connection configuration (PUT), or updates an existing
-            /// one (PATCH).
+            /// Description for Creates a new hybrid connection configuration (PUT), or
+            /// updates an existing one (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12528,7 +12467,7 @@ public static RelayServiceConnectionEntity UpdateRelayServiceConnectionSlot(this
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12552,7 +12491,7 @@ public static IPage<SiteInstance> ListInstanceIdentifiersSlot(this IWebAppsOpera
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12579,10 +12518,68 @@ public static IPage<SiteInstance> ListInstanceIdentifiersSlot(this IWebAppsOpera
             }
 
             /// <summary>
-            /// Get the status of the last MSDeploy operation.
+            /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
+            /// Description for Gets all scale-out instances of an app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='instanceId'>
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the deployment slot. If a slot is not specified, the API gets the
+            /// production slot instances.
+            /// </param>
+            public static WebSiteInstanceStatus GetInstanceInfoSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string instanceId, string slot)
+            {
+                return operations.GetInstanceInfoSlotAsync(resourceGroupName, name, instanceId, slot).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets all scale-out instances of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Gets all scale-out instances of an app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='instanceId'>
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the deployment slot. If a slot is not specified, the API gets the
+            /// production slot instances.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<WebSiteInstanceStatus> GetInstanceInfoSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string instanceId, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetInstanceInfoSlotWithHttpMessagesAsync(resourceGroupName, name, instanceId, slot, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
             /// Get the status of the last MSDeploy operation.
+            /// </summary>
+            /// <remarks>
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12609,7 +12606,7 @@ public static MSDeployStatus GetInstanceMsDeployStatusSlot(this IWebAppsOperatio
             /// Get the status of the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the status of the last MSDeploy operation.
+            /// Description for Get the status of the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12642,7 +12639,7 @@ public static MSDeployStatus GetInstanceMsDeployStatusSlot(this IWebAppsOperatio
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12672,7 +12669,7 @@ public static MSDeployStatus CreateInstanceMSDeployOperationSlot(this IWebAppsOp
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12708,7 +12705,7 @@ public static MSDeployStatus CreateInstanceMSDeployOperationSlot(this IWebAppsOp
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12735,7 +12732,7 @@ public static MSDeployLog GetInstanceMSDeployLogSlot(this IWebAppsOperations ope
             /// Get the MSDeploy Log for the last MSDeploy operation.
             /// </summary>
             /// <remarks>
-            /// Get the MSDeploy Log for the last MSDeploy operation.
+            /// Description for Get the MSDeploy Log for the last MSDeploy operation.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12769,8 +12766,8 @@ public static MSDeployLog GetInstanceMSDeployLogSlot(this IWebAppsOperations ope
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12799,8 +12796,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesSlot(this IWebAppsOperatio
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12835,8 +12832,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesSlot(this IWebAppsOperatio
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12868,8 +12865,8 @@ public static ProcessInfo GetInstanceProcessSlot(this IWebAppsOperations operati
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12907,8 +12904,8 @@ public static ProcessInfo GetInstanceProcessSlot(this IWebAppsOperations operati
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12940,8 +12937,8 @@ public static void DeleteInstanceProcessSlot(this IWebAppsOperations operations,
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -12976,8 +12973,8 @@ public static void DeleteInstanceProcessSlot(this IWebAppsOperations operations,
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13009,8 +13006,8 @@ public static Stream GetInstanceProcessDumpSlot(this IWebAppsOperations operatio
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13047,8 +13044,8 @@ public static Stream GetInstanceProcessDumpSlot(this IWebAppsOperations operatio
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13080,8 +13077,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesSlot(this IWebA
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13119,8 +13116,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesSlot(this IWebA
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13155,8 +13152,8 @@ public static ProcessModuleInfo GetInstanceProcessModuleSlot(this IWebAppsOperat
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13186,90 +13183,18 @@ public static ProcessModuleInfo GetInstanceProcessModuleSlot(this IWebAppsOperat
             /// </param>
             public static async Task<ProcessModuleInfo> GetInstanceProcessModuleSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string baseAddress, string slot, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetInstanceProcessModuleSlotWithHttpMessagesAsync(resourceGroupName, name, processId, baseAddress, slot, instanceId, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
-            /// </summary>
-            /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API returns
-            /// deployments for the production slot.
-            /// </param>
-            /// <param name='instanceId'>
-            /// ID of a specific scaled-out instance. This is the value of the name
-            /// property in the JSON response from "GET api/sites/{siteName}/instances".
-            /// </param>
-            public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, string instanceId)
-            {
-                return operations.ListInstanceProcessThreadsSlotAsync(resourceGroupName, name, processId, slot, instanceId).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
-            /// </summary>
-            /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API returns
-            /// deployments for the production slot.
-            /// </param>
-            /// <param name='instanceId'>
-            /// ID of a specific scaled-out instance. This is the value of the name
-            /// property in the JSON response from "GET api/sites/{siteName}/instances".
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ProcessThreadInfo>> ListInstanceProcessThreadsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListInstanceProcessThreadsSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, instanceId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetInstanceProcessModuleSlotWithHttpMessagesAsync(resourceGroupName, name, processId, baseAddress, slot, instanceId, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// List the threads in a process by its ID for a specific scaled-out instance
+            /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
+            /// Description for List the threads in a process by its ID for a specific
             /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
@@ -13284,9 +13209,6 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlot(this IWebA
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
@@ -13295,17 +13217,17 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlot(this IWebA
             /// ID of a specific scaled-out instance. This is the value of the name
             /// property in the JSON response from "GET api/sites/{siteName}/instances".
             /// </param>
-            public static ProcessThreadInfo GetInstanceProcessThreadSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string slot, string instanceId)
+            public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, string instanceId)
             {
-                return operations.GetInstanceProcessThreadSlotAsync(resourceGroupName, name, processId, threadId, slot, instanceId).GetAwaiter().GetResult();
+                return operations.ListInstanceProcessThreadsSlotAsync(resourceGroupName, name, processId, slot, instanceId).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// List the threads in a process by its ID for a specific scaled-out instance
+            /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
+            /// Description for List the threads in a process by its ID for a specific
             /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
@@ -13320,9 +13242,6 @@ public static ProcessThreadInfo GetInstanceProcessThreadSlot(this IWebAppsOperat
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
@@ -13334,9 +13253,9 @@ public static ProcessThreadInfo GetInstanceProcessThreadSlot(this IWebAppsOperat
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProcessThreadInfo> GetInstanceProcessThreadSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string slot, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ProcessThreadInfo>> ListInstanceProcessThreadsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, string instanceId, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetInstanceProcessThreadSlotWithHttpMessagesAsync(resourceGroupName, name, processId, threadId, slot, instanceId, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListInstanceProcessThreadsSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, instanceId, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -13347,8 +13266,8 @@ public static ProcessThreadInfo GetInstanceProcessThreadSlot(this IWebAppsOperat
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Description for Shows whether an app can be cloned to another resource
+            /// group or subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13373,8 +13292,8 @@ public static SiteCloneability IsCloneableSlot(this IWebAppsOperations operation
             /// subscription.
             /// </summary>
             /// <remarks>
-            /// Shows whether an app can be cloned to another resource group or
-            /// subscription.
+            /// Description for Shows whether an app can be cloned to another resource
+            /// group or subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13401,64 +13320,10 @@ public static SiteCloneability IsCloneableSlot(this IWebAppsOperations operation
             }
 
             /// <summary>
-            /// This is to allow calling via powershell and ARM template.
-            /// </summary>
-            /// <remarks>
-            /// This is to allow calling via powershell and ARM template.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will
-            /// restore a backup of the production slot.
-            /// </param>
-            public static FunctionSecrets ListSyncFunctionTriggersSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
-            {
-                return operations.ListSyncFunctionTriggersSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// This is to allow calling via powershell and ARM template.
-            /// </summary>
-            /// <remarks>
-            /// This is to allow calling via powershell and ARM template.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Name of the app.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will
-            /// restore a backup of the production slot.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<FunctionSecrets> ListSyncFunctionTriggersSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListSyncFunctionTriggersSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13471,18 +13336,18 @@ public static FunctionSecrets ListSyncFunctionTriggersSlot(this IWebAppsOperatio
             /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API will get
-            /// metric definitions of the production slot.
+            /// backups of the production slot.
             /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
+            public static IPage<BackupItem> ListSiteBackupsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
             {
-                return operations.ListMetricDefinitionsSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult();
+                return operations.ListSiteBackupsSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13495,24 +13360,24 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlot(this IWe
             /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API will get
-            /// metric definitions of the production slot.
+            /// backups of the production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefinitionsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BackupItem>> ListSiteBackupsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListMetricDefinitionsSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSiteBackupsSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// This is to allow calling via powershell and ARM template.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for This is to allow calling via powershell and ARM template.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13524,29 +13389,18 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlot(this IWe
             /// Name of the app.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will get
-            /// metrics of the production slot.
-            /// </param>
-            /// <param name='details'>
-            /// Specify "true" to include metric details in the response. It is "false" by
-            /// default.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only metrics specified in the filter (using OData syntax). For
-            /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-            /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-            /// timeGrain eq duration'[Hour|Minute|Day]'.
+            /// Name of the deployment slot.
             /// </param>
-            public static IPage<ResourceMetric> ListMetricsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, bool? details = default(bool?), string filter = default(string))
+            public static FunctionSecrets ListSyncFunctionTriggersSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
             {
-                return operations.ListMetricsSlotAsync(resourceGroupName, name, slot, details, filter).GetAwaiter().GetResult();
+                return operations.ListSyncFunctionTriggersSlotAsync(resourceGroupName, name, slot).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// This is to allow calling via powershell and ARM template.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for This is to allow calling via powershell and ARM template.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13558,25 +13412,14 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlot(this IWe
             /// Name of the app.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will get
-            /// metrics of the production slot.
-            /// </param>
-            /// <param name='details'>
-            /// Specify "true" to include metric details in the response. It is "false" by
-            /// default.
-            /// </param>
-            /// <param name='filter'>
-            /// Return only metrics specified in the filter (using OData syntax). For
-            /// example: $filter=(name.value eq 'Metric1' or name.value eq 'Metric2') and
-            /// startTime eq 2014-01-01T00:00:00Z and endTime eq 2014-12-31T23:59:59Z and
-            /// timeGrain eq duration'[Hour|Minute|Day]'.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, bool? details = default(bool?), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<FunctionSecrets> ListSyncFunctionTriggersSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListMetricsSlotWithHttpMessagesAsync(resourceGroupName, name, slot, details, filter, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSyncFunctionTriggersSlotWithHttpMessagesAsync(resourceGroupName, name, slot, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -13587,8 +13430,8 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlot(this IWe
             /// or not MySql in app is enabled
             /// </summary>
             /// <remarks>
-            /// Returns the status of MySql in app migration, if one is active, and whether
-            /// or not MySql in app is enabled
+            /// Description for Returns the status of MySql in app migration, if one is
+            /// active, and whether or not MySql in app is enabled
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13612,8 +13455,8 @@ public static MigrateMySqlStatus GetMigrateMySqlStatusSlot(this IWebAppsOperatio
             /// or not MySql in app is enabled
             /// </summary>
             /// <remarks>
-            /// Returns the status of MySql in app migration, if one is active, and whether
-            /// or not MySql in app is enabled
+            /// Description for Returns the status of MySql in app migration, if one is
+            /// active, and whether or not MySql in app is enabled
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13642,7 +13485,7 @@ public static MigrateMySqlStatus GetMigrateMySqlStatusSlot(this IWebAppsOperatio
             /// Gets a Swift Virtual Network connection.
             /// </summary>
             /// <remarks>
-            /// Gets a Swift Virtual Network connection.
+            /// Description for Gets a Swift Virtual Network connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13666,7 +13509,7 @@ public static SwiftVirtualNetwork GetSwiftVirtualNetworkConnectionSlot(this IWeb
             /// Gets a Swift Virtual Network connection.
             /// </summary>
             /// <remarks>
-            /// Gets a Swift Virtual Network connection.
+            /// Description for Gets a Swift Virtual Network connection.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13699,9 +13542,10 @@ public static SwiftVirtualNetwork GetSwiftVirtualNetworkConnectionSlot(this IWeb
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -13732,9 +13576,10 @@ public static SwiftVirtualNetwork CreateOrUpdateSwiftVirtualNetworkConnectionSlo
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -13769,8 +13614,8 @@ public static SwiftVirtualNetwork CreateOrUpdateSwiftVirtualNetworkConnectionSlo
             /// slot).
             /// </summary>
             /// <remarks>
-            /// Deletes a Swift Virtual Network connection from an app (or deployment
-            /// slot).
+            /// Description for Deletes a Swift Virtual Network connection from an app (or
+            /// deployment slot).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13795,8 +13640,8 @@ public static void DeleteSwiftVirtualNetworkSlot(this IWebAppsOperations operati
             /// slot).
             /// </summary>
             /// <remarks>
-            /// Deletes a Swift Virtual Network connection from an app (or deployment
-            /// slot).
+            /// Description for Deletes a Swift Virtual Network connection from an app (or
+            /// deployment slot).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13826,9 +13671,10 @@ public static void DeleteSwiftVirtualNetworkSlot(this IWebAppsOperations operati
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -13859,9 +13705,10 @@ public static SwiftVirtualNetwork UpdateSwiftVirtualNetworkConnectionSlot(this I
             /// in use by another App Service Plan other than the one this App is in.
             /// </summary>
             /// <remarks>
-            /// Integrates this Web App with a Virtual Network. This requires that 1)
-            /// "swiftSupported" is true when doing a GET against this resource, and 2)
-            /// that the target Subnet has already been delegated, and is not
+            /// Description for Integrates this Web App with a Virtual Network. This
+            /// requires that 1) "swiftSupported" is true when doing a GET against this
+            /// resource, and 2) that the target Subnet has already been delegated, and is
+            /// not
             /// in use by another App Service Plan other than the one this App is in.
             /// </remarks>
             /// <param name='operations'>
@@ -13896,8 +13743,8 @@ public static SwiftVirtualNetwork UpdateSwiftVirtualNetworkConnectionSlot(this I
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets all network features used by the app (or deployment slot, if
-            /// specified).
+            /// Description for Gets all network features used by the app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13925,8 +13772,8 @@ public static NetworkFeatures ListNetworkFeaturesSlot(this IWebAppsOperations op
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets all network features used by the app (or deployment slot, if
-            /// specified).
+            /// Description for Gets all network features used by the app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13960,8 +13807,8 @@ public static NetworkFeatures ListNetworkFeaturesSlot(this IWebAppsOperations op
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -13989,8 +13836,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14023,7 +13870,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// Start capturing network packets for the site (To be deprecated).
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site (To be deprecated).
+            /// Description for Start capturing network packets for the site (To be
+            /// deprecated).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14055,7 +13903,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// Start capturing network packets for the site (To be deprecated).
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site (To be deprecated).
+            /// Description for Start capturing network packets for the site (To be
+            /// deprecated).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14093,7 +13942,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14125,7 +13974,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14163,7 +14012,7 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlot(this IWebAppsOper
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14186,7 +14035,7 @@ public static void StopWebSiteNetworkTraceSlot(this IWebAppsOperations operation
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14213,8 +14062,8 @@ public static void StopWebSiteNetworkTraceSlot(this IWebAppsOperations operation
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14242,8 +14091,8 @@ public static IList<NetworkTrace> GetNetworkTracesSlot(this IWebAppsOperations o
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14277,8 +14126,8 @@ public static IList<NetworkTrace> GetNetworkTracesSlot(this IWebAppsOperations o
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14306,8 +14155,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlotV2(this IWebAppsOp
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14341,8 +14190,8 @@ public static IList<NetworkTrace> GetNetworkTraceOperationSlotV2(this IWebAppsOp
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14370,8 +14219,8 @@ public static IList<NetworkTrace> GetNetworkTracesSlotV2(this IWebAppsOperations
             /// if specified).
             /// </summary>
             /// <remarks>
-            /// Gets a named operation for a network trace capturing (or deployment slot,
-            /// if specified).
+            /// Description for Gets a named operation for a network trace capturing (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14405,8 +14254,8 @@ public static IList<NetworkTrace> GetNetworkTracesSlotV2(this IWebAppsOperations
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Generates a new publishing password for an app (or deployment slot, if
-            /// specified).
+            /// Description for Generates a new publishing password for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14431,8 +14280,8 @@ public static void GenerateNewSitePublishingPasswordSlot(this IWebAppsOperations
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Generates a new publishing password for an app (or deployment slot, if
-            /// specified).
+            /// Description for Generates a new publishing password for an app (or
+            /// deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14459,7 +14308,7 @@ public static void GenerateNewSitePublishingPasswordSlot(this IWebAppsOperations
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14489,7 +14338,7 @@ public static void GenerateNewSitePublishingPasswordSlot(this IWebAppsOperations
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14525,7 +14374,7 @@ public static void GenerateNewSitePublishingPasswordSlot(this IWebAppsOperations
             /// Gets web app's event logs.
             /// </summary>
             /// <remarks>
-            /// Gets web app's event logs.
+            /// Description for Gets web app's event logs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14549,7 +14398,7 @@ public static SitePhpErrorLogFlag GetSitePhpErrorLogFlagSlot(this IWebAppsOperat
             /// Gets web app's event logs.
             /// </summary>
             /// <remarks>
-            /// Gets web app's event logs.
+            /// Description for Gets web app's event logs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14579,7 +14428,7 @@ public static SitePhpErrorLogFlag GetSitePhpErrorLogFlagSlot(this IWebAppsOperat
             /// Gets the premier add-ons of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the premier add-ons of an app.
+            /// Description for Gets the premier add-ons of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14603,7 +14452,7 @@ public static PremierAddOn ListPremierAddOnsSlot(this IWebAppsOperations operati
             /// Gets the premier add-ons of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the premier add-ons of an app.
+            /// Description for Gets the premier add-ons of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14633,7 +14482,7 @@ public static PremierAddOn ListPremierAddOnsSlot(this IWebAppsOperations operati
             /// Gets a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Gets a named add-on of an app.
+            /// Description for Gets a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14660,7 +14509,7 @@ public static PremierAddOn GetPremierAddOnSlot(this IWebAppsOperations operation
             /// Gets a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Gets a named add-on of an app.
+            /// Description for Gets a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14693,7 +14542,7 @@ public static PremierAddOn GetPremierAddOnSlot(this IWebAppsOperations operation
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14723,7 +14572,7 @@ public static PremierAddOn AddPremierAddOnSlot(this IWebAppsOperations operation
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14759,7 +14608,7 @@ public static PremierAddOn AddPremierAddOnSlot(this IWebAppsOperations operation
             /// Delete a premier add-on from an app.
             /// </summary>
             /// <remarks>
-            /// Delete a premier add-on from an app.
+            /// Description for Delete a premier add-on from an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14786,7 +14635,7 @@ public static void DeletePremierAddOnSlot(this IWebAppsOperations operations, st
             /// Delete a premier add-on from an app.
             /// </summary>
             /// <remarks>
-            /// Delete a premier add-on from an app.
+            /// Description for Delete a premier add-on from an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14816,7 +14665,7 @@ public static void DeletePremierAddOnSlot(this IWebAppsOperations operations, st
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14846,7 +14695,7 @@ public static PremierAddOn UpdatePremierAddOnSlot(this IWebAppsOperations operat
             /// Updates a named add-on of an app.
             /// </summary>
             /// <remarks>
-            /// Updates a named add-on of an app.
+            /// Description for Updates a named add-on of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14883,8 +14732,8 @@ public static PremierAddOn UpdatePremierAddOnSlot(this IWebAppsOperations operat
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Gets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Gets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14908,8 +14757,8 @@ public static PrivateAccess GetPrivateAccessSlot(this IWebAppsOperations operati
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Gets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Gets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14939,8 +14788,8 @@ public static PrivateAccess GetPrivateAccessSlot(this IWebAppsOperations operati
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Sets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Sets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -14967,8 +14816,8 @@ public static PrivateAccess PutPrivateAccessVnetSlot(this IWebAppsOperations ope
             /// Networks that can access the site.
             /// </summary>
             /// <remarks>
-            /// Sets data around private site access enablement and authorized Virtual
-            /// Networks that can access the site.
+            /// Description for Sets data around private site access enablement and
+            /// authorized Virtual Networks that can access the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15001,8 +14850,8 @@ public static PrivateAccess PutPrivateAccessVnetSlot(this IWebAppsOperations ope
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15027,8 +14876,8 @@ public static IPage<ProcessInfo> ListProcessesSlot(this IWebAppsOperations opera
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15059,8 +14908,8 @@ public static IPage<ProcessInfo> ListProcessesSlot(this IWebAppsOperations opera
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15088,8 +14937,8 @@ public static ProcessInfo GetProcessSlot(this IWebAppsOperations operations, str
             /// web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15123,8 +14972,8 @@ public static ProcessInfo GetProcessSlot(this IWebAppsOperations operations, str
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15152,8 +15001,8 @@ public static void DeleteProcessSlot(this IWebAppsOperations operations, string
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Terminate a process by its ID for a web site, or a deployment slot, or
-            /// specific scaled-out instance in a web site.
+            /// Description for Terminate a process by its ID for a web site, or a
+            /// deployment slot, or specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15184,8 +15033,8 @@ public static void DeleteProcessSlot(this IWebAppsOperations operations, string
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15213,8 +15062,8 @@ public static Stream GetProcessDumpSlot(this IWebAppsOperations operations, stri
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get a memory dump of a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get a memory dump of a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15239,80 +15088,16 @@ public static Stream GetProcessDumpSlot(this IWebAppsOperations operations, stri
             {
                 var _result = await operations.GetProcessDumpSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, null, cancellationToken).ConfigureAwait(false);
                 _result.Request.Dispose();
-                return _result.Body;
-            }
-
-            /// <summary>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
-            /// </summary>
-            /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API returns
-            /// deployments for the production slot.
-            /// </param>
-            public static IPage<ProcessModuleInfo> ListProcessModulesSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot)
-            {
-                return operations.ListProcessModulesSlotAsync(resourceGroupName, name, processId, slot).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
-            /// </summary>
-            /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='name'>
-            /// Site name.
-            /// </param>
-            /// <param name='processId'>
-            /// PID.
-            /// </param>
-            /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API returns
-            /// deployments for the production slot.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ProcessModuleInfo>> ListProcessModulesSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListProcessModulesSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
+                return _result.Body;
             }
 
             /// <summary>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// List module information for a process by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15326,25 +15111,22 @@ public static IPage<ProcessModuleInfo> ListProcessModulesSlot(this IWebAppsOpera
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='baseAddress'>
-            /// Module base address.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
             /// </param>
-            public static ProcessModuleInfo GetProcessModuleSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string baseAddress, string slot)
+            public static IPage<ProcessModuleInfo> ListProcessModulesSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot)
             {
-                return operations.GetProcessModuleSlotAsync(resourceGroupName, name, processId, baseAddress, slot).GetAwaiter().GetResult();
+                return operations.ListProcessModulesSlotAsync(resourceGroupName, name, processId, slot).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// List module information for a process by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get process information by its ID for a specific scaled-out instance in a
-            /// web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15358,9 +15140,6 @@ public static ProcessModuleInfo GetProcessModuleSlot(this IWebAppsOperations ope
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='baseAddress'>
-            /// Module base address.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
@@ -15368,21 +15147,21 @@ public static ProcessModuleInfo GetProcessModuleSlot(this IWebAppsOperations ope
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProcessModuleInfo> GetProcessModuleSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string baseAddress, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ProcessModuleInfo>> ListProcessModulesSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetProcessModuleSlotWithHttpMessagesAsync(resourceGroupName, name, processId, baseAddress, slot, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListProcessModulesSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Get process information by its ID for a specific scaled-out instance in a
+            /// web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15396,22 +15175,25 @@ public static ProcessModuleInfo GetProcessModuleSlot(this IWebAppsOperations ope
             /// <param name='processId'>
             /// PID.
             /// </param>
+            /// <param name='baseAddress'>
+            /// Module base address.
+            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
             /// </param>
-            public static IPage<ProcessThreadInfo> ListProcessThreadsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot)
+            public static ProcessModuleInfo GetProcessModuleSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string baseAddress, string slot)
             {
-                return operations.ListProcessThreadsSlotAsync(resourceGroupName, name, processId, slot).GetAwaiter().GetResult();
+                return operations.GetProcessModuleSlotAsync(resourceGroupName, name, processId, baseAddress, slot).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Get process information by its ID for a specific scaled-out instance in a
+            /// web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for Get process information by its ID for a specific scaled-out
+            /// instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15425,6 +15207,9 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsSlot(this IWebAppsOpera
             /// <param name='processId'>
             /// PID.
             /// </param>
+            /// <param name='baseAddress'>
+            /// Module base address.
+            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
@@ -15432,20 +15217,20 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsSlot(this IWebAppsOpera
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ProcessThreadInfo>> ListProcessThreadsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ProcessModuleInfo> GetProcessModuleSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string baseAddress, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListProcessThreadsSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetProcessModuleSlotWithHttpMessagesAsync(resourceGroupName, name, processId, baseAddress, slot, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// List the threads in a process by its ID for a specific scaled-out instance
+            /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
+            /// Description for List the threads in a process by its ID for a specific
             /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
@@ -15460,24 +15245,21 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsSlot(this IWebAppsOpera
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
             /// </param>
-            public static ProcessThreadInfo GetProcessThreadSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string slot)
+            public static IPage<ProcessThreadInfo> ListProcessThreadsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot)
             {
-                return operations.GetProcessThreadSlotAsync(resourceGroupName, name, processId, threadId, slot).GetAwaiter().GetResult();
+                return operations.ListProcessThreadsSlotAsync(resourceGroupName, name, processId, slot).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get thread information by Thread ID for a specific process, in a specific
-            /// scaled-out instance in a web site.
+            /// List the threads in a process by its ID for a specific scaled-out instance
+            /// in a web site.
             /// </summary>
             /// <remarks>
-            /// Get thread information by Thread ID for a specific process, in a specific
+            /// Description for List the threads in a process by its ID for a specific
             /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
@@ -15492,9 +15274,6 @@ public static ProcessThreadInfo GetProcessThreadSlot(this IWebAppsOperations ope
             /// <param name='processId'>
             /// PID.
             /// </param>
-            /// <param name='threadId'>
-            /// TID.
-            /// </param>
             /// <param name='slot'>
             /// Name of the deployment slot. If a slot is not specified, the API returns
             /// deployments for the production slot.
@@ -15502,9 +15281,9 @@ public static ProcessThreadInfo GetProcessThreadSlot(this IWebAppsOperations ope
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProcessThreadInfo> GetProcessThreadSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string threadId, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<ProcessThreadInfo>> ListProcessThreadsSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string processId, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetProcessThreadSlotWithHttpMessagesAsync(resourceGroupName, name, processId, threadId, slot, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListProcessThreadsSlotWithHttpMessagesAsync(resourceGroupName, name, processId, slot, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -15514,7 +15293,7 @@ public static ProcessThreadInfo GetProcessThreadSlot(this IWebAppsOperations ope
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15538,7 +15317,7 @@ public static IPage<PublicCertificate> ListPublicCertificatesSlot(this IWebAppsO
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15569,8 +15348,8 @@ public static IPage<PublicCertificate> ListPublicCertificatesSlot(this IWebAppsO
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named public certificate for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15598,8 +15377,8 @@ public static PublicCertificate GetPublicCertificateSlot(this IWebAppsOperations
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Get the named public certificate for an app (or deployment slot, if
-            /// specified).
+            /// Description for Get the named public certificate for an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15632,7 +15411,7 @@ public static PublicCertificate GetPublicCertificateSlot(this IWebAppsOperations
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15663,7 +15442,7 @@ public static PublicCertificate CreateOrUpdatePublicCertificateSlot(this IWebApp
             /// Creates a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Creates a hostname binding for an app.
+            /// Description for Creates a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15700,7 +15479,7 @@ public static PublicCertificate CreateOrUpdatePublicCertificateSlot(this IWebApp
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15727,7 +15506,7 @@ public static void DeletePublicCertificateSlot(this IWebAppsOperations operation
             /// Deletes a hostname binding for an app.
             /// </summary>
             /// <remarks>
-            /// Deletes a hostname binding for an app.
+            /// Description for Deletes a hostname binding for an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15757,7 +15536,8 @@ public static void DeletePublicCertificateSlot(this IWebAppsOperations operation
             /// Gets the publishing profile for an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Gets the publishing profile for an app (or deployment slot, if specified).
+            /// Description for Gets the publishing profile for an app (or deployment slot,
+            /// if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15785,7 +15565,8 @@ public static Stream ListPublishingProfileXmlWithSecretsSlot(this IWebAppsOperat
             /// Gets the publishing profile for an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Gets the publishing profile for an app (or deployment slot, if specified).
+            /// Description for Gets the publishing profile for an app (or deployment slot,
+            /// if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15819,8 +15600,8 @@ public static Stream ListPublishingProfileXmlWithSecretsSlot(this IWebAppsOperat
             /// previously modified by calling the API with POST.
             /// </summary>
             /// <remarks>
-            /// Resets the configuration settings of the current slot if they were
-            /// previously modified by calling the API with POST.
+            /// Description for Resets the configuration settings of the current slot if
+            /// they were previously modified by calling the API with POST.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15845,8 +15626,8 @@ public static void ResetSlotConfigurationSlot(this IWebAppsOperations operations
             /// previously modified by calling the API with POST.
             /// </summary>
             /// <remarks>
-            /// Resets the configuration settings of the current slot if they were
-            /// previously modified by calling the API with POST.
+            /// Description for Resets the configuration settings of the current slot if
+            /// they were previously modified by calling the API with POST.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15873,7 +15654,7 @@ public static void ResetSlotConfigurationSlot(this IWebAppsOperations operations
             /// Restarts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Restarts an app (or deployment slot, if specified).
+            /// Description for Restarts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15905,7 +15686,7 @@ public static void ResetSlotConfigurationSlot(this IWebAppsOperations operations
             /// Restarts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Restarts an app (or deployment slot, if specified).
+            /// Description for Restarts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15940,7 +15721,7 @@ public static void ResetSlotConfigurationSlot(this IWebAppsOperations operations
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15967,7 +15748,7 @@ public static void RestoreFromBackupBlobSlot(this IWebAppsOperations operations,
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -15997,7 +15778,7 @@ public static void RestoreFromBackupBlobSlot(this IWebAppsOperations operations,
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16024,7 +15805,7 @@ public static void RestoreFromDeletedAppSlot(this IWebAppsOperations operations,
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16054,7 +15835,7 @@ public static void RestoreFromDeletedAppSlot(this IWebAppsOperations operations,
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16082,7 +15863,7 @@ public static void RestoreSnapshotSlot(this IWebAppsOperations operations, strin
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16113,7 +15894,8 @@ public static void RestoreSnapshotSlot(this IWebAppsOperations operations, strin
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16125,8 +15907,8 @@ public static void RestoreSnapshotSlot(this IWebAppsOperations operations, strin
             /// Site name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static IPage<SiteExtensionInfo> ListSiteExtensionsSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
             {
@@ -16137,7 +15919,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlot(this IWebAppsOpera
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16149,8 +15932,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlot(this IWebAppsOpera
             /// Site name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -16168,8 +15951,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlot(this IWebAppsOpera
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Get site extension information by its ID for a web site, or a deployment
-            /// slot.
+            /// Description for Get site extension information by its ID for a web site, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16184,8 +15967,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlot(this IWebAppsOpera
             /// Site extension name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static SiteExtensionInfo GetSiteExtensionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string siteExtensionId, string slot)
             {
@@ -16197,8 +15980,8 @@ public static SiteExtensionInfo GetSiteExtensionSlot(this IWebAppsOperations ope
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Get site extension information by its ID for a web site, or a deployment
-            /// slot.
+            /// Description for Get site extension information by its ID for a web site, or
+            /// a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16213,8 +15996,8 @@ public static SiteExtensionInfo GetSiteExtensionSlot(this IWebAppsOperations ope
             /// Site extension name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -16231,7 +16014,7 @@ public static SiteExtensionInfo GetSiteExtensionSlot(this IWebAppsOperations ope
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16246,8 +16029,8 @@ public static SiteExtensionInfo GetSiteExtensionSlot(this IWebAppsOperations ope
             /// Site extension name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static SiteExtensionInfo InstallSiteExtensionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string siteExtensionId, string slot)
             {
@@ -16258,7 +16041,7 @@ public static SiteExtensionInfo InstallSiteExtensionSlot(this IWebAppsOperations
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16273,8 +16056,8 @@ public static SiteExtensionInfo InstallSiteExtensionSlot(this IWebAppsOperations
             /// Site extension name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -16291,7 +16074,8 @@ public static SiteExtensionInfo InstallSiteExtensionSlot(this IWebAppsOperations
             /// Remove a site extension from a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Remove a site extension from a web site, or a deployment slot.
+            /// Description for Remove a site extension from a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16318,7 +16102,8 @@ public static void DeleteSiteExtensionSlot(this IWebAppsOperations operations, s
             /// Remove a site extension from a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Remove a site extension from a web site, or a deployment slot.
+            /// Description for Remove a site extension from a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16345,10 +16130,72 @@ public static void DeleteSiteExtensionSlot(this IWebAppsOperations operations, s
             }
 
             /// <summary>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Copies a deployment slot to another deployment slot of an app.
             /// </summary>
             /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the source slot. If a slot is not specified, the production slot is
+            /// used as the source slot.
+            /// </param>
+            public static void CopySlotSlot(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot)
+            {
+                operations.CopySlotSlotAsync(resourceGroupName, name, copySlotEntity, slot).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Copies a deployment slot to another deployment slot of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the source slot. If a slot is not specified, the production slot is
+            /// used as the source slot.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task CopySlotSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                (await operations.CopySlotSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, slot, null, cancellationToken).ConfigureAwait(false)).Dispose();
+            }
+
+            /// <summary>
             /// Get the difference in configuration settings between two web app slots.
+            /// </summary>
+            /// <remarks>
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16375,7 +16222,8 @@ public static IPage<SlotDifference> ListSlotDifferencesSlot(this IWebAppsOperati
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16408,7 +16256,7 @@ public static IPage<SlotDifference> ListSlotDifferencesSlot(this IWebAppsOperati
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16435,7 +16283,7 @@ public static void SwapSlotSlot(this IWebAppsOperations operations, string resou
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16465,7 +16313,7 @@ public static void SwapSlotSlot(this IWebAppsOperations operations, string resou
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16488,7 +16336,7 @@ public static IPage<Snapshot> ListSnapshotsSlot(this IWebAppsOperations operatio
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16517,7 +16365,8 @@ public static IPage<Snapshot> ListSnapshotsSlot(this IWebAppsOperations operatio
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16540,7 +16389,8 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondarySlot(this IWebAppsOper
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16569,7 +16419,7 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondarySlot(this IWebAppsOper
             /// Gets the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the source control configuration of an app.
+            /// Description for Gets the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16593,7 +16443,7 @@ public static SiteSourceControl GetSourceControlSlot(this IWebAppsOperations ope
             /// Gets the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the source control configuration of an app.
+            /// Description for Gets the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16623,7 +16473,7 @@ public static SiteSourceControl GetSourceControlSlot(this IWebAppsOperations ope
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16650,7 +16500,7 @@ public static SiteSourceControl CreateOrUpdateSourceControlSlot(this IWebAppsOpe
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16683,7 +16533,7 @@ public static SiteSourceControl CreateOrUpdateSourceControlSlot(this IWebAppsOpe
             /// Deletes the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the source control configuration of an app.
+            /// Description for Deletes the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16707,7 +16557,7 @@ public static void DeleteSourceControlSlot(this IWebAppsOperations operations, s
             /// Deletes the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the source control configuration of an app.
+            /// Description for Deletes the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16734,7 +16584,7 @@ public static void DeleteSourceControlSlot(this IWebAppsOperations operations, s
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16761,7 +16611,7 @@ public static SiteSourceControl UpdateSourceControlSlot(this IWebAppsOperations
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16794,7 +16644,7 @@ public static SiteSourceControl UpdateSourceControlSlot(this IWebAppsOperations
             /// Starts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Starts an app (or deployment slot, if specified).
+            /// Description for Starts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16818,7 +16668,7 @@ public static void StartSlot(this IWebAppsOperations operations, string resource
             /// Starts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Starts an app (or deployment slot, if specified).
+            /// Description for Starts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16845,7 +16695,7 @@ public static void StartSlot(this IWebAppsOperations operations, string resource
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16877,7 +16727,7 @@ public static void StartSlot(this IWebAppsOperations operations, string resource
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16915,7 +16765,7 @@ public static void StartSlot(this IWebAppsOperations operations, string resource
             /// Stops an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Stops an app (or deployment slot, if specified).
+            /// Description for Stops an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16939,7 +16789,7 @@ public static void StopSlot(this IWebAppsOperations operations, string resourceG
             /// Stops an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Stops an app (or deployment slot, if specified).
+            /// Description for Stops an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16966,7 +16816,7 @@ public static void StopSlot(this IWebAppsOperations operations, string resourceG
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -16989,7 +16839,7 @@ public static void StopNetworkTraceSlot(this IWebAppsOperations operations, stri
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17015,7 +16865,7 @@ public static void StopNetworkTraceSlot(this IWebAppsOperations operations, stri
             /// Sync web app repository.
             /// </summary>
             /// <remarks>
-            /// Sync web app repository.
+            /// Description for Sync web app repository.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17039,7 +16889,7 @@ public static void SyncRepositorySlot(this IWebAppsOperations operations, string
             /// Sync web app repository.
             /// </summary>
             /// <remarks>
-            /// Sync web app repository.
+            /// Description for Sync web app repository.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17066,7 +16916,7 @@ public static void SyncRepositorySlot(this IWebAppsOperations operations, string
             /// Syncs function trigger metadata to the scale controller
             /// </summary>
             /// <remarks>
-            /// Syncs function trigger metadata to the scale controller
+            /// Description for Syncs function trigger metadata to the scale controller
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17078,8 +16928,7 @@ public static void SyncRepositorySlot(this IWebAppsOperations operations, string
             /// Name of the app.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will
-            /// restore a backup of the production slot.
+            /// Name of the deployment slot.
             /// </param>
             public static void SyncFunctionTriggersSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string slot)
             {
@@ -17090,7 +16939,7 @@ public static void SyncFunctionTriggersSlot(this IWebAppsOperations operations,
             /// Syncs function trigger metadata to the scale controller
             /// </summary>
             /// <remarks>
-            /// Syncs function trigger metadata to the scale controller
+            /// Description for Syncs function trigger metadata to the scale controller
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17102,8 +16951,7 @@ public static void SyncFunctionTriggersSlot(this IWebAppsOperations operations,
             /// Name of the app.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API will
-            /// restore a backup of the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17117,7 +16965,7 @@ public static void SyncFunctionTriggersSlot(this IWebAppsOperations operations,
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17141,7 +16989,7 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsSlot(this IWebAppsOpera
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17171,7 +17019,8 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsSlot(this IWebAppsOpera
             /// Gets a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17186,8 +17035,8 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsSlot(this IWebAppsOpera
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static TriggeredWebJob GetTriggeredWebJobSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string webJobName, string slot)
             {
@@ -17198,7 +17047,8 @@ public static TriggeredWebJob GetTriggeredWebJobSlot(this IWebAppsOperations ope
             /// Gets a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17213,8 +17063,8 @@ public static TriggeredWebJob GetTriggeredWebJobSlot(this IWebAppsOperations ope
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17231,7 +17081,8 @@ public static TriggeredWebJob GetTriggeredWebJobSlot(this IWebAppsOperations ope
             /// Delete a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17246,8 +17097,8 @@ public static TriggeredWebJob GetTriggeredWebJobSlot(this IWebAppsOperations ope
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API deletes
+            /// web job for the production slot.
             /// </param>
             public static void DeleteTriggeredWebJobSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string webJobName, string slot)
             {
@@ -17258,7 +17109,8 @@ public static void DeleteTriggeredWebJobSlot(this IWebAppsOperations operations,
             /// Delete a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17273,8 +17125,8 @@ public static void DeleteTriggeredWebJobSlot(this IWebAppsOperations operations,
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API deletes
+            /// web job for the production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17288,7 +17140,8 @@ public static void DeleteTriggeredWebJobSlot(this IWebAppsOperations operations,
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17303,8 +17156,8 @@ public static void DeleteTriggeredWebJobSlot(this IWebAppsOperations operations,
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlot(this IWebAppsOperations operations, string resourceGroupName, string name, string webJobName, string slot)
             {
@@ -17315,7 +17168,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlot(this IWe
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17330,8 +17184,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlot(this IWe
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17349,8 +17203,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlot(this IWe
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job's history by its ID for an app, , or a deployment
-            /// slot.
+            /// Description for Gets a triggered web job's history by its ID for an app, ,
+            /// or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17368,8 +17222,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlot(this IWe
             /// History ID.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static TriggeredJobHistory GetTriggeredWebJobHistorySlot(this IWebAppsOperations operations, string resourceGroupName, string name, string webJobName, string id, string slot)
             {
@@ -17381,8 +17235,8 @@ public static TriggeredJobHistory GetTriggeredWebJobHistorySlot(this IWebAppsOpe
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job's history by its ID for an app, , or a deployment
-            /// slot.
+            /// Description for Gets a triggered web job's history by its ID for an app, ,
+            /// or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17400,8 +17254,8 @@ public static TriggeredJobHistory GetTriggeredWebJobHistorySlot(this IWebAppsOpe
             /// History ID.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17418,7 +17272,7 @@ public static TriggeredJobHistory GetTriggeredWebJobHistorySlot(this IWebAppsOpe
             /// Run a triggered web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Run a triggered web job for an app, or a deployment slot.
+            /// Description for Run a triggered web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17433,8 +17287,8 @@ public static TriggeredJobHistory GetTriggeredWebJobHistorySlot(this IWebAppsOpe
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string webJobName, string slot)
             {
@@ -17445,7 +17299,7 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st
             /// Run a triggered web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Run a triggered web job for an app, or a deployment slot.
+            /// Description for Run a triggered web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17460,8 +17314,8 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st
             /// Name of Web Job.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -17476,8 +17330,8 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17508,8 +17362,8 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17545,7 +17399,8 @@ public static void RunTriggeredWebJobSlot(this IWebAppsOperations operations, st
             /// Gets the virtual networks the app (or deployment slot) is connected to.
             /// </summary>
             /// <remarks>
-            /// Gets the virtual networks the app (or deployment slot) is connected to.
+            /// Description for Gets the virtual networks the app (or deployment slot) is
+            /// connected to.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17569,7 +17424,8 @@ public static IList<VnetInfo> ListVnetConnectionsSlot(this IWebAppsOperations op
             /// Gets the virtual networks the app (or deployment slot) is connected to.
             /// </summary>
             /// <remarks>
-            /// Gets the virtual networks the app (or deployment slot) is connected to.
+            /// Description for Gets the virtual networks the app (or deployment slot) is
+            /// connected to.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17600,8 +17456,8 @@ public static IList<VnetInfo> ListVnetConnectionsSlot(this IWebAppsOperations op
             /// name.
             /// </summary>
             /// <remarks>
-            /// Gets a virtual network the app (or deployment slot) is connected to by
-            /// name.
+            /// Description for Gets a virtual network the app (or deployment slot) is
+            /// connected to by name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17629,8 +17485,8 @@ public static VnetInfo GetVnetConnectionSlot(this IWebAppsOperations operations,
             /// name.
             /// </summary>
             /// <remarks>
-            /// Gets a virtual network the app (or deployment slot) is connected to by
-            /// name.
+            /// Description for Gets a virtual network the app (or deployment slot) is
+            /// connected to by name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17664,8 +17520,8 @@ public static VnetInfo GetVnetConnectionSlot(this IWebAppsOperations operations,
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17696,8 +17552,8 @@ public static VnetInfo CreateOrUpdateVnetConnectionSlot(this IWebAppsOperations
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17734,8 +17590,8 @@ public static VnetInfo CreateOrUpdateVnetConnectionSlot(this IWebAppsOperations
             /// network.
             /// </summary>
             /// <remarks>
-            /// Deletes a connection from an app (or deployment slot to a named virtual
-            /// network.
+            /// Description for Deletes a connection from an app (or deployment slot to a
+            /// named virtual network.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17763,8 +17619,8 @@ public static void DeleteVnetConnectionSlot(this IWebAppsOperations operations,
             /// network.
             /// </summary>
             /// <remarks>
-            /// Deletes a connection from an app (or deployment slot to a named virtual
-            /// network.
+            /// Description for Deletes a connection from an app (or deployment slot to a
+            /// named virtual network.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17795,8 +17651,8 @@ public static void DeleteVnetConnectionSlot(this IWebAppsOperations operations,
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17827,8 +17683,8 @@ public static VnetInfo UpdateVnetConnectionSlot(this IWebAppsOperations operatio
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17864,7 +17720,7 @@ public static VnetInfo UpdateVnetConnectionSlot(this IWebAppsOperations operatio
             /// Gets an app's Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Gets an app's Virtual Network gateway.
+            /// Description for Gets an app's Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17894,7 +17750,7 @@ public static VnetGateway GetVnetConnectionGatewaySlot(this IWebAppsOperations o
             /// Gets an app's Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Gets an app's Virtual Network gateway.
+            /// Description for Gets an app's Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17930,7 +17786,8 @@ public static VnetGateway GetVnetConnectionGatewaySlot(this IWebAppsOperations o
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -17963,7 +17820,8 @@ public static VnetGateway CreateOrUpdateVnetConnectionGatewaySlot(this IWebAppsO
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18002,7 +17860,8 @@ public static VnetGateway CreateOrUpdateVnetConnectionGatewaySlot(this IWebAppsO
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18035,7 +17894,8 @@ public static VnetGateway UpdateVnetConnectionGatewaySlot(this IWebAppsOperation
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18074,7 +17934,7 @@ public static VnetGateway UpdateVnetConnectionGatewaySlot(this IWebAppsOperation
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18098,7 +17958,7 @@ public static IPage<WebJob> ListWebJobsSlot(this IWebAppsOperations operations,
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18128,7 +17988,7 @@ public static IPage<WebJob> ListWebJobsSlot(this IWebAppsOperations operations,
             /// Get webjob information for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get webjob information for an app, or a deployment slot.
+            /// Description for Get webjob information for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18155,7 +18015,7 @@ public static WebJob GetWebJobSlot(this IWebAppsOperations operations, string re
             /// Get webjob information for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get webjob information for an app, or a deployment slot.
+            /// Description for Get webjob information for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18188,7 +18048,8 @@ public static WebJob GetWebJobSlot(this IWebAppsOperations operations, string re
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18211,7 +18072,8 @@ public static IPage<SlotDifference> ListSlotDifferencesFromProduction(this IWebA
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18240,7 +18102,7 @@ public static IPage<SlotDifference> ListSlotDifferencesFromProduction(this IWebA
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18263,7 +18125,7 @@ public static void SwapSlotWithProduction(this IWebAppsOperations operations, st
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18289,7 +18151,7 @@ public static void SwapSlotWithProduction(this IWebAppsOperations operations, st
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18309,7 +18171,7 @@ public static IPage<Snapshot> ListSnapshots(this IWebAppsOperations operations,
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18335,7 +18197,8 @@ public static IPage<Snapshot> ListSnapshots(this IWebAppsOperations operations,
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18355,7 +18218,8 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondary(this IWebAppsOperatio
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18381,7 +18245,7 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondary(this IWebAppsOperatio
             /// Gets the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the source control configuration of an app.
+            /// Description for Gets the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18401,7 +18265,7 @@ public static SiteSourceControl GetSourceControl(this IWebAppsOperations operati
             /// Gets the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the source control configuration of an app.
+            /// Description for Gets the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18427,7 +18291,7 @@ public static SiteSourceControl GetSourceControl(this IWebAppsOperations operati
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18450,7 +18314,7 @@ public static SiteSourceControl CreateOrUpdateSourceControl(this IWebAppsOperati
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18479,7 +18343,7 @@ public static SiteSourceControl CreateOrUpdateSourceControl(this IWebAppsOperati
             /// Deletes the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the source control configuration of an app.
+            /// Description for Deletes the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18499,7 +18363,7 @@ public static void DeleteSourceControl(this IWebAppsOperations operations, strin
             /// Deletes the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Deletes the source control configuration of an app.
+            /// Description for Deletes the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18522,7 +18386,7 @@ public static void DeleteSourceControl(this IWebAppsOperations operations, strin
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18545,7 +18409,7 @@ public static SiteSourceControl UpdateSourceControl(this IWebAppsOperations oper
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18574,7 +18438,7 @@ public static SiteSourceControl UpdateSourceControl(this IWebAppsOperations oper
             /// Starts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Starts an app (or deployment slot, if specified).
+            /// Description for Starts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18594,7 +18458,7 @@ public static void Start(this IWebAppsOperations operations, string resourceGrou
             /// Starts an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Starts an app (or deployment slot, if specified).
+            /// Description for Starts an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18617,7 +18481,7 @@ public static void Start(this IWebAppsOperations operations, string resourceGrou
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18646,7 +18510,7 @@ public static void Start(this IWebAppsOperations operations, string resourceGrou
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18681,7 +18545,7 @@ public static void Start(this IWebAppsOperations operations, string resourceGrou
             /// Stops an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Stops an app (or deployment slot, if specified).
+            /// Description for Stops an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18701,7 +18565,7 @@ public static void Stop(this IWebAppsOperations operations, string resourceGroup
             /// Stops an app (or deployment slot, if specified).
             /// </summary>
             /// <remarks>
-            /// Stops an app (or deployment slot, if specified).
+            /// Description for Stops an app (or deployment slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18724,7 +18588,7 @@ public static void Stop(this IWebAppsOperations operations, string resourceGroup
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18744,7 +18608,7 @@ public static void StopNetworkTrace(this IWebAppsOperations operations, string r
             /// Stop ongoing capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Stop ongoing capturing network packets for the site.
+            /// Description for Stop ongoing capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18767,7 +18631,7 @@ public static void StopNetworkTrace(this IWebAppsOperations operations, string r
             /// Sync web app repository.
             /// </summary>
             /// <remarks>
-            /// Sync web app repository.
+            /// Description for Sync web app repository.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18787,7 +18651,7 @@ public static void SyncRepository(this IWebAppsOperations operations, string res
             /// Sync web app repository.
             /// </summary>
             /// <remarks>
-            /// Sync web app repository.
+            /// Description for Sync web app repository.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18810,7 +18674,7 @@ public static void SyncRepository(this IWebAppsOperations operations, string res
             /// Syncs function trigger metadata to the scale controller
             /// </summary>
             /// <remarks>
-            /// Syncs function trigger metadata to the scale controller
+            /// Description for Syncs function trigger metadata to the scale controller
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18830,7 +18694,7 @@ public static void SyncFunctionTriggers(this IWebAppsOperations operations, stri
             /// Syncs function trigger metadata to the scale controller
             /// </summary>
             /// <remarks>
-            /// Syncs function trigger metadata to the scale controller
+            /// Description for Syncs function trigger metadata to the scale controller
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18853,7 +18717,7 @@ public static void SyncFunctionTriggers(this IWebAppsOperations operations, stri
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18873,7 +18737,7 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobs(this IWebAppsOperation
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18899,7 +18763,8 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobs(this IWebAppsOperation
             /// Gets a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18922,7 +18787,8 @@ public static TriggeredWebJob GetTriggeredWebJob(this IWebAppsOperations operati
             /// Gets a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Gets a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18951,7 +18817,8 @@ public static TriggeredWebJob GetTriggeredWebJob(this IWebAppsOperations operati
             /// Delete a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -18974,7 +18841,8 @@ public static void DeleteTriggeredWebJob(this IWebAppsOperations operations, str
             /// Delete a triggered web job by its ID for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Delete a triggered web job by its ID for an app, or a deployment slot.
+            /// Description for Delete a triggered web job by its ID for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19000,7 +18868,8 @@ public static void DeleteTriggeredWebJob(this IWebAppsOperations operations, str
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19023,7 +18892,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistory(this IWebApp
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19053,8 +18923,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistory(this IWebApp
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job's history by its ID for an app, , or a deployment
-            /// slot.
+            /// Description for Gets a triggered web job's history by its ID for an app, ,
+            /// or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19081,8 +18951,8 @@ public static TriggeredJobHistory GetTriggeredWebJobHistory(this IWebAppsOperati
             /// slot.
             /// </summary>
             /// <remarks>
-            /// Gets a triggered web job's history by its ID for an app, , or a deployment
-            /// slot.
+            /// Description for Gets a triggered web job's history by its ID for an app, ,
+            /// or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19114,7 +18984,7 @@ public static TriggeredJobHistory GetTriggeredWebJobHistory(this IWebAppsOperati
             /// Run a triggered web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Run a triggered web job for an app, or a deployment slot.
+            /// Description for Run a triggered web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19137,7 +19007,7 @@ public static void RunTriggeredWebJob(this IWebAppsOperations operations, string
             /// Run a triggered web job for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Run a triggered web job for an app, or a deployment slot.
+            /// Description for Run a triggered web job for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19164,8 +19034,8 @@ public static void RunTriggeredWebJob(this IWebAppsOperations operations, string
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19192,8 +19062,8 @@ public static void RunTriggeredWebJob(this IWebAppsOperations operations, string
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19225,7 +19095,8 @@ public static void RunTriggeredWebJob(this IWebAppsOperations operations, string
             /// Gets the virtual networks the app (or deployment slot) is connected to.
             /// </summary>
             /// <remarks>
-            /// Gets the virtual networks the app (or deployment slot) is connected to.
+            /// Description for Gets the virtual networks the app (or deployment slot) is
+            /// connected to.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19245,7 +19116,8 @@ public static IList<VnetInfo> ListVnetConnections(this IWebAppsOperations operat
             /// Gets the virtual networks the app (or deployment slot) is connected to.
             /// </summary>
             /// <remarks>
-            /// Gets the virtual networks the app (or deployment slot) is connected to.
+            /// Description for Gets the virtual networks the app (or deployment slot) is
+            /// connected to.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19272,8 +19144,8 @@ public static IList<VnetInfo> ListVnetConnections(this IWebAppsOperations operat
             /// name.
             /// </summary>
             /// <remarks>
-            /// Gets a virtual network the app (or deployment slot) is connected to by
-            /// name.
+            /// Description for Gets a virtual network the app (or deployment slot) is
+            /// connected to by name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19297,8 +19169,8 @@ public static VnetInfo GetVnetConnection(this IWebAppsOperations operations, str
             /// name.
             /// </summary>
             /// <remarks>
-            /// Gets a virtual network the app (or deployment slot) is connected to by
-            /// name.
+            /// Description for Gets a virtual network the app (or deployment slot) is
+            /// connected to by name.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19328,8 +19200,8 @@ public static VnetInfo GetVnetConnection(this IWebAppsOperations operations, str
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19356,8 +19228,8 @@ public static VnetInfo CreateOrUpdateVnetConnection(this IWebAppsOperations oper
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19390,8 +19262,8 @@ public static VnetInfo CreateOrUpdateVnetConnection(this IWebAppsOperations oper
             /// network.
             /// </summary>
             /// <remarks>
-            /// Deletes a connection from an app (or deployment slot to a named virtual
-            /// network.
+            /// Description for Deletes a connection from an app (or deployment slot to a
+            /// named virtual network.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19415,8 +19287,8 @@ public static void DeleteVnetConnection(this IWebAppsOperations operations, stri
             /// network.
             /// </summary>
             /// <remarks>
-            /// Deletes a connection from an app (or deployment slot to a named virtual
-            /// network.
+            /// Description for Deletes a connection from an app (or deployment slot to a
+            /// named virtual network.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19443,8 +19315,8 @@ public static void DeleteVnetConnection(this IWebAppsOperations operations, stri
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19471,8 +19343,8 @@ public static VnetInfo UpdateVnetConnection(this IWebAppsOperations operations,
             /// connection properties (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a Virtual Network connection to an app or slot (PUT) or updates the
-            /// connection properties (PATCH).
+            /// Description for Adds a Virtual Network connection to an app or slot (PUT)
+            /// or updates the connection properties (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19504,7 +19376,7 @@ public static VnetInfo UpdateVnetConnection(this IWebAppsOperations operations,
             /// Gets an app's Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Gets an app's Virtual Network gateway.
+            /// Description for Gets an app's Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19530,7 +19402,7 @@ public static VnetGateway GetVnetConnectionGateway(this IWebAppsOperations opera
             /// Gets an app's Virtual Network gateway.
             /// </summary>
             /// <remarks>
-            /// Gets an app's Virtual Network gateway.
+            /// Description for Gets an app's Virtual Network gateway.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19562,7 +19434,8 @@ public static VnetGateway GetVnetConnectionGateway(this IWebAppsOperations opera
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19591,7 +19464,8 @@ public static VnetGateway CreateOrUpdateVnetConnectionGateway(this IWebAppsOpera
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19626,7 +19500,8 @@ public static VnetGateway CreateOrUpdateVnetConnectionGateway(this IWebAppsOpera
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19655,7 +19530,8 @@ public static VnetGateway UpdateVnetConnectionGateway(this IWebAppsOperations op
             /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
             /// </summary>
             /// <remarks>
-            /// Adds a gateway to a connected Virtual Network (PUT) or updates it (PATCH).
+            /// Description for Adds a gateway to a connected Virtual Network (PUT) or
+            /// updates it (PATCH).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19690,7 +19566,7 @@ public static VnetGateway UpdateVnetConnectionGateway(this IWebAppsOperations op
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19710,7 +19586,7 @@ public static IPage<WebJob> ListWebJobs(this IWebAppsOperations operations, stri
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19736,7 +19612,7 @@ public static IPage<WebJob> ListWebJobs(this IWebAppsOperations operations, stri
             /// Get webjob information for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get webjob information for an app, or a deployment slot.
+            /// Description for Get webjob information for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19759,7 +19635,7 @@ public static WebJob GetWebJob(this IWebAppsOperations operations, string resour
             /// Get webjob information for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get webjob information for an app, or a deployment slot.
+            /// Description for Get webjob information for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19789,8 +19665,8 @@ public static WebJob GetWebJob(this IWebAppsOperations operations, string resour
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19815,8 +19691,8 @@ public static Site BeginCreateOrUpdate(this IWebAppsOperations operations, strin
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19847,8 +19723,8 @@ public static Site BeginCreateOrUpdate(this IWebAppsOperations operations, strin
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19875,8 +19751,8 @@ public static void BeginRestore(this IWebAppsOperations operations, string resou
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19905,7 +19781,7 @@ public static void BeginRestore(this IWebAppsOperations operations, string resou
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19925,7 +19801,7 @@ public static User BeginListPublishingCredentials(this IWebAppsOperations operat
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19951,7 +19827,7 @@ public static User BeginListPublishingCredentials(this IWebAppsOperations operat
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -19974,7 +19850,7 @@ public static MSDeployStatus BeginCreateMSDeployOperation(this IWebAppsOperation
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20003,7 +19879,7 @@ public static MSDeployStatus BeginCreateMSDeployOperation(this IWebAppsOperation
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20029,7 +19905,7 @@ public static FunctionEnvelope BeginCreateFunction(this IWebAppsOperations opera
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20061,7 +19937,7 @@ public static FunctionEnvelope BeginCreateFunction(this IWebAppsOperations opera
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20087,7 +19963,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperation(this IWebAppsO
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20119,7 +19995,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperation(this IWebAppsO
             /// Restores a web app.
             /// </summary>
             /// <remarks>
-            /// Restores a web app.
+            /// Description for Restores a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20145,7 +20021,7 @@ public static StorageMigrationResponse BeginMigrateStorage(this IWebAppsOperatio
             /// Restores a web app.
             /// </summary>
             /// <remarks>
-            /// Restores a web app.
+            /// Description for Restores a web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20177,7 +20053,8 @@ public static StorageMigrationResponse BeginMigrateStorage(this IWebAppsOperatio
             /// Migrates a local (in-app) MySql database to a remote MySql database.
             /// </summary>
             /// <remarks>
-            /// Migrates a local (in-app) MySql database to a remote MySql database.
+            /// Description for Migrates a local (in-app) MySql database to a remote MySql
+            /// database.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20200,7 +20077,8 @@ public static Operation BeginMigrateMySql(this IWebAppsOperations operations, st
             /// Migrates a local (in-app) MySql database to a remote MySql database.
             /// </summary>
             /// <remarks>
-            /// Migrates a local (in-app) MySql database to a remote MySql database.
+            /// Description for Migrates a local (in-app) MySql database to a remote MySql
+            /// database.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20229,7 +20107,7 @@ public static Operation BeginMigrateMySql(this IWebAppsOperations operations, st
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20258,7 +20136,7 @@ public static Operation BeginMigrateMySql(this IWebAppsOperations operations, st
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20293,7 +20171,7 @@ public static Operation BeginMigrateMySql(this IWebAppsOperations operations, st
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20316,7 +20194,7 @@ public static void BeginRestoreFromBackupBlob(this IWebAppsOperations operations
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20342,7 +20220,7 @@ public static void BeginRestoreFromBackupBlob(this IWebAppsOperations operations
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20365,7 +20243,7 @@ public static void BeginRestoreFromDeletedApp(this IWebAppsOperations operations
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20391,7 +20269,7 @@ public static void BeginRestoreFromDeletedApp(this IWebAppsOperations operations
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20415,7 +20293,7 @@ public static void BeginRestoreSnapshot(this IWebAppsOperations operations, stri
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20442,7 +20320,7 @@ public static void BeginRestoreSnapshot(this IWebAppsOperations operations, stri
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20465,7 +20343,7 @@ public static SiteExtensionInfo BeginInstallSiteExtension(this IWebAppsOperation
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20491,12 +20369,65 @@ public static SiteExtensionInfo BeginInstallSiteExtension(this IWebAppsOperation
             }
 
             /// <summary>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Copies a deployment slot to another deployment slot of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            public static void BeginCopyProductionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity)
+            {
+                operations.BeginCopyProductionSlotAsync(resourceGroupName, name, copySlotEntity).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Copies a deployment slot to another deployment slot of an app.
             /// </summary>
             /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task BeginCopyProductionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                (await operations.BeginCopyProductionSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, null, cancellationToken).ConfigureAwait(false)).Dispose();
+            }
+
+            /// <summary>
             /// Creates a new web, mobile, or API app in an existing resource group, or
             /// updates an existing app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20525,8 +20456,8 @@ public static Site BeginCreateOrUpdateSlot(this IWebAppsOperations operations, s
             /// updates an existing app.
             /// </summary>
             /// <remarks>
-            /// Creates a new web, mobile, or API app in an existing resource group, or
-            /// updates an existing app.
+            /// Description for Creates a new web, mobile, or API app in an existing
+            /// resource group, or updates an existing app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20561,8 +20492,8 @@ public static Site BeginCreateOrUpdateSlot(this IWebAppsOperations operations, s
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20593,8 +20524,8 @@ public static void BeginRestoreSlot(this IWebAppsOperations operations, string r
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Restores a specific backup to another app (or deployment slot, if
-            /// specified).
+            /// Description for Restores a specific backup to another app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20627,7 +20558,7 @@ public static void BeginRestoreSlot(this IWebAppsOperations operations, string r
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20651,7 +20582,7 @@ public static User BeginListPublishingCredentialsSlot(this IWebAppsOperations op
             /// Gets the Git/FTP publishing credentials of an app.
             /// </summary>
             /// <remarks>
-            /// Gets the Git/FTP publishing credentials of an app.
+            /// Description for Gets the Git/FTP publishing credentials of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20681,7 +20612,7 @@ public static User BeginListPublishingCredentialsSlot(this IWebAppsOperations op
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20708,7 +20639,7 @@ public static MSDeployStatus BeginCreateMSDeployOperationSlot(this IWebAppsOpera
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20741,7 +20672,7 @@ public static MSDeployStatus BeginCreateMSDeployOperationSlot(this IWebAppsOpera
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20756,8 +20687,7 @@ public static MSDeployStatus BeginCreateMSDeployOperationSlot(this IWebAppsOpera
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='functionEnvelope'>
             /// Function details.
@@ -20771,7 +20701,7 @@ public static FunctionEnvelope BeginCreateInstanceFunctionSlot(this IWebAppsOper
             /// Create function for web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Create function for web site, or a deployment slot.
+            /// Description for Create function for web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20786,8 +20716,7 @@ public static FunctionEnvelope BeginCreateInstanceFunctionSlot(this IWebAppsOper
             /// Function name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot.
             /// </param>
             /// <param name='functionEnvelope'>
             /// Function details.
@@ -20807,7 +20736,7 @@ public static FunctionEnvelope BeginCreateInstanceFunctionSlot(this IWebAppsOper
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20837,7 +20766,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperationSlot(this IWebA
             /// Invoke the MSDeploy web app extension.
             /// </summary>
             /// <remarks>
-            /// Invoke the MSDeploy web app extension.
+            /// Description for Invoke the MSDeploy web app extension.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20873,7 +20802,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperationSlot(this IWebA
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20905,7 +20834,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperationSlot(this IWebA
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20943,7 +20872,7 @@ public static MSDeployStatus BeginCreateInstanceMSDeployOperationSlot(this IWebA
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -20970,7 +20899,7 @@ public static void BeginRestoreFromBackupBlobSlot(this IWebAppsOperations operat
             /// Restores an app from a backup blob in Azure Storage.
             /// </summary>
             /// <remarks>
-            /// Restores an app from a backup blob in Azure Storage.
+            /// Description for Restores an app from a backup blob in Azure Storage.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21000,7 +20929,7 @@ public static void BeginRestoreFromBackupBlobSlot(this IWebAppsOperations operat
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21027,7 +20956,7 @@ public static void BeginRestoreFromDeletedAppSlot(this IWebAppsOperations operat
             /// Restores a deleted web app to this web app.
             /// </summary>
             /// <remarks>
-            /// Restores a deleted web app to this web app.
+            /// Description for Restores a deleted web app to this web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21057,7 +20986,7 @@ public static void BeginRestoreFromDeletedAppSlot(this IWebAppsOperations operat
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21085,7 +21014,7 @@ public static void BeginRestoreSnapshotSlot(this IWebAppsOperations operations,
             /// Restores a web app from a snapshot.
             /// </summary>
             /// <remarks>
-            /// Restores a web app from a snapshot.
+            /// Description for Restores a web app from a snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21116,7 +21045,7 @@ public static void BeginRestoreSnapshotSlot(this IWebAppsOperations operations,
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21131,8 +21060,8 @@ public static void BeginRestoreSnapshotSlot(this IWebAppsOperations operations,
             /// Site extension name.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
             /// </param>
             public static SiteExtensionInfo BeginInstallSiteExtensionSlot(this IWebAppsOperations operations, string resourceGroupName, string name, string siteExtensionId, string slot)
             {
@@ -21143,7 +21072,70 @@ public static SiteExtensionInfo BeginInstallSiteExtensionSlot(this IWebAppsOpera
             /// Install site extension on a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Install site extension on a web site, or a deployment slot.
+            /// Description for Install site extension on a web site, or a deployment slot.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Site name.
+            /// </param>
+            /// <param name='siteExtensionId'>
+            /// Site extension name.
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the deployment slot. If a slot is not specified, the API uses the
+            /// production slot.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<SiteExtensionInfo> BeginInstallSiteExtensionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string siteExtensionId, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginInstallSiteExtensionSlotWithHttpMessagesAsync(resourceGroupName, name, siteExtensionId, slot, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Copies a deployment slot to another deployment slot of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
+            /// </remarks>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='resourceGroupName'>
+            /// Name of the resource group to which the resource belongs.
+            /// </param>
+            /// <param name='name'>
+            /// Name of the app.
+            /// </param>
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
+            /// </param>
+            /// <param name='slot'>
+            /// Name of the source slot. If a slot is not specified, the production slot is
+            /// used as the source slot.
+            /// </param>
+            public static void BeginCopySlotSlot(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot)
+            {
+                operations.BeginCopySlotSlotAsync(resourceGroupName, name, copySlotEntity, slot).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Copies a deployment slot to another deployment slot of an app.
+            /// </summary>
+            /// <remarks>
+            /// Description for Copies a deployment slot to another deployment slot of an
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21152,31 +21144,29 @@ public static SiteExtensionInfo BeginInstallSiteExtensionSlot(this IWebAppsOpera
             /// Name of the resource group to which the resource belongs.
             /// </param>
             /// <param name='name'>
-            /// Site name.
+            /// Name of the app.
             /// </param>
-            /// <param name='siteExtensionId'>
-            /// Site extension name.
+            /// <param name='copySlotEntity'>
+            /// JSON object that contains the target slot name and site config properties
+            /// to override the source slot config. See example.
             /// </param>
             /// <param name='slot'>
-            /// Name of the deployment slot. If a slot is not specified, the API deletes a
-            /// deployment for the production slot.
+            /// Name of the source slot. If a slot is not specified, the production slot is
+            /// used as the source slot.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<SiteExtensionInfo> BeginInstallSiteExtensionSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, string siteExtensionId, string slot, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task BeginCopySlotSlotAsync(this IWebAppsOperations operations, string resourceGroupName, string name, CsmCopySlotEntity copySlotEntity, string slot, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginInstallSiteExtensionSlotWithHttpMessagesAsync(resourceGroupName, name, siteExtensionId, slot, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
+                (await operations.BeginCopySlotSlotWithHttpMessagesAsync(resourceGroupName, name, copySlotEntity, slot, null, cancellationToken).ConfigureAwait(false)).Dispose();
             }
 
             /// <summary>
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21203,7 +21193,7 @@ public static void BeginSwapSlotSlot(this IWebAppsOperations operations, string
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21233,7 +21223,7 @@ public static void BeginSwapSlotSlot(this IWebAppsOperations operations, string
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21260,7 +21250,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControlSlot(this IWebAp
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21293,7 +21283,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControlSlot(this IWebAp
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21325,7 +21315,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControlSlot(this IWebAp
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21363,7 +21353,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControlSlot(this IWebAp
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21386,7 +21376,7 @@ public static void BeginSwapSlotWithProduction(this IWebAppsOperations operation
             /// Swaps two deployment slots of an app.
             /// </summary>
             /// <remarks>
-            /// Swaps two deployment slots of an app.
+            /// Description for Swaps two deployment slots of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21412,7 +21402,7 @@ public static void BeginSwapSlotWithProduction(this IWebAppsOperations operation
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21435,7 +21425,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControl(this IWebAppsOp
             /// Updates the source control configuration of an app.
             /// </summary>
             /// <remarks>
-            /// Updates the source control configuration of an app.
+            /// Description for Updates the source control configuration of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21464,7 +21454,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControl(this IWebAppsOp
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21493,7 +21483,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControl(this IWebAppsOp
             /// Start capturing network packets for the site.
             /// </summary>
             /// <remarks>
-            /// Start capturing network packets for the site.
+            /// Description for Start capturing network packets for the site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21528,7 +21518,7 @@ public static SiteSourceControl BeginCreateOrUpdateSourceControl(this IWebAppsOp
             /// Get all apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all apps for a subscription.
+            /// Description for Get all apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21545,7 +21535,7 @@ public static IPage<Site> ListNext(this IWebAppsOperations operations, string ne
             /// Get all apps for a subscription.
             /// </summary>
             /// <remarks>
-            /// Get all apps for a subscription.
+            /// Description for Get all apps for a subscription.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21568,7 +21558,8 @@ public static IPage<Site> ListNext(this IWebAppsOperations operations, string ne
             /// Gets all web, mobile, and API apps in the specified resource group.
             /// </summary>
             /// <remarks>
-            /// Gets all web, mobile, and API apps in the specified resource group.
+            /// Description for Gets all web, mobile, and API apps in the specified
+            /// resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21585,7 +21576,8 @@ public static IPage<Site> ListByResourceGroupNext(this IWebAppsOperations operat
             /// Gets all web, mobile, and API apps in the specified resource group.
             /// </summary>
             /// <remarks>
-            /// Gets all web, mobile, and API apps in the specified resource group.
+            /// Description for Gets all web, mobile, and API apps in the specified
+            /// resource group.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21608,7 +21600,7 @@ public static IPage<Site> ListByResourceGroupNext(this IWebAppsOperations operat
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21625,7 +21617,7 @@ public static IPage<BackupItem> ListBackupsNext(this IWebAppsOperations operatio
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21648,7 +21640,7 @@ public static IPage<BackupItem> ListBackupsNext(this IWebAppsOperations operatio
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21665,7 +21657,7 @@ public static IPage<SiteConfigResource> ListConfigurationsNext(this IWebAppsOper
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21689,8 +21681,8 @@ public static IPage<SiteConfigResource> ListConfigurationsNext(this IWebAppsOper
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21708,8 +21700,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21732,7 +21724,7 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21749,7 +21741,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsNext(this IWebAppsOpe
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21772,7 +21764,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsNext(this IWebAppsOpe
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21789,7 +21781,7 @@ public static IPage<Deployment> ListDeploymentsNext(this IWebAppsOperations oper
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21812,7 +21804,8 @@ public static IPage<Deployment> ListDeploymentsNext(this IWebAppsOperations oper
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21829,7 +21822,8 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersNext(this IWebApps
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21852,7 +21846,7 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersNext(this IWebApps
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21869,7 +21863,7 @@ public static IPage<FunctionEnvelope> ListFunctionsNext(this IWebAppsOperations
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21892,7 +21886,7 @@ public static IPage<FunctionEnvelope> ListFunctionsNext(this IWebAppsOperations
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21909,7 +21903,7 @@ public static IPage<HostNameBinding> ListHostNameBindingsNext(this IWebAppsOpera
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21932,7 +21926,7 @@ public static IPage<HostNameBinding> ListHostNameBindingsNext(this IWebAppsOpera
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21949,7 +21943,7 @@ public static IPage<SiteInstance> ListInstanceIdentifiersNext(this IWebAppsOpera
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21973,8 +21967,8 @@ public static IPage<SiteInstance> ListInstanceIdentifiersNext(this IWebAppsOpera
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -21992,8 +21986,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesNext(this IWebAppsOperatio
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22017,8 +22011,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesNext(this IWebAppsOperatio
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22036,8 +22030,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesNext(this IWebA
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22061,8 +22055,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesNext(this IWebA
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22080,8 +22074,8 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsNext(this IWebA
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22101,50 +22095,10 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsNext(this IWebA
             }
 
             /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </summary>
-            /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefinitionsNext(this IWebAppsOperations operations, string nextPageLink)
-            {
-                return operations.ListMetricDefinitionsNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </summary>
-            /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefinitionsNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricDefinitionsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22152,16 +22106,16 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsNext(this IWe
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<ResourceMetric> ListMetricsNext(this IWebAppsOperations operations, string nextPageLink)
+            public static IPage<BackupItem> ListSiteBackupsNext(this IWebAppsOperations operations, string nextPageLink)
             {
-                return operations.ListMetricsNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListSiteBackupsNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22172,9 +22126,9 @@ public static IPage<ResourceMetric> ListMetricsNext(this IWebAppsOperations oper
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BackupItem>> ListSiteBackupsNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListMetricsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSiteBackupsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -22184,7 +22138,7 @@ public static IPage<ResourceMetric> ListMetricsNext(this IWebAppsOperations oper
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22201,7 +22155,7 @@ public static IPage<PerfMonResponse> ListPerfMonCountersNext(this IWebAppsOperat
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22225,8 +22179,8 @@ public static IPage<PerfMonResponse> ListPerfMonCountersNext(this IWebAppsOperat
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22244,8 +22198,8 @@ public static IPage<ProcessInfo> ListProcessesNext(this IWebAppsOperations opera
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22269,8 +22223,8 @@ public static IPage<ProcessInfo> ListProcessesNext(this IWebAppsOperations opera
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22288,8 +22242,8 @@ public static IPage<ProcessModuleInfo> ListProcessModulesNext(this IWebAppsOpera
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22313,8 +22267,8 @@ public static IPage<ProcessModuleInfo> ListProcessModulesNext(this IWebAppsOpera
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22332,8 +22286,8 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsNext(this IWebAppsOpera
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22356,7 +22310,7 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsNext(this IWebAppsOpera
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22373,7 +22327,7 @@ public static IPage<PublicCertificate> ListPublicCertificatesNext(this IWebAppsO
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22396,7 +22350,8 @@ public static IPage<PublicCertificate> ListPublicCertificatesNext(this IWebAppsO
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22413,7 +22368,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsNext(this IWebAppsOpera
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22436,7 +22392,7 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsNext(this IWebAppsOpera
             /// Gets an app's deployment slots.
             /// </summary>
             /// <remarks>
-            /// Gets an app's deployment slots.
+            /// Description for Gets an app's deployment slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22453,7 +22409,7 @@ public static IPage<Site> ListSlotsNext(this IWebAppsOperations operations, stri
             /// Gets an app's deployment slots.
             /// </summary>
             /// <remarks>
-            /// Gets an app's deployment slots.
+            /// Description for Gets an app's deployment slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22476,7 +22432,7 @@ public static IPage<Site> ListSlotsNext(this IWebAppsOperations operations, stri
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22493,7 +22449,7 @@ public static IPage<BackupItem> ListBackupsSlotNext(this IWebAppsOperations oper
             /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets existing backups of an app.
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22516,7 +22472,7 @@ public static IPage<BackupItem> ListBackupsSlotNext(this IWebAppsOperations oper
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22533,7 +22489,7 @@ public static IPage<SiteConfigResource> ListConfigurationsSlotNext(this IWebApps
             /// List the configurations of an app
             /// </summary>
             /// <remarks>
-            /// List the configurations of an app
+            /// Description for List the configurations of an app
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22557,8 +22513,8 @@ public static IPage<SiteConfigResource> ListConfigurationsSlotNext(this IWebApps
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22576,8 +22532,8 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// the list contains a timestamp and the ID of the snapshot.
             /// </summary>
             /// <remarks>
-            /// Gets a list of web app configuration snapshots identifiers. Each element of
-            /// the list contains a timestamp and the ID of the snapshot.
+            /// Description for Gets a list of web app configuration snapshots identifiers.
+            /// Each element of the list contains a timestamp and the ID of the snapshot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22600,7 +22556,7 @@ public static IPage<SiteConfigurationSnapshotInfo> ListConfigurationSnapshotInfo
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22617,7 +22573,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsSlotNext(this IWebApp
             /// List continuous web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List continuous web jobs for an app, or a deployment slot.
+            /// Description for List continuous web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22640,7 +22596,7 @@ public static IPage<ContinuousWebJob> ListContinuousWebJobsSlotNext(this IWebApp
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22657,7 +22613,7 @@ public static IPage<Deployment> ListDeploymentsSlotNext(this IWebAppsOperations
             /// List deployments for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List deployments for an app, or a deployment slot.
+            /// Description for List deployments for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22680,7 +22636,8 @@ public static IPage<Deployment> ListDeploymentsSlotNext(this IWebAppsOperations
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22697,7 +22654,8 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersSlotNext(this IWeb
             /// Lists ownership identifiers for domain associated with web app.
             /// </summary>
             /// <remarks>
-            /// Lists ownership identifiers for domain associated with web app.
+            /// Description for Lists ownership identifiers for domain associated with web
+            /// app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22720,7 +22678,7 @@ public static IPage<Identifier> ListDomainOwnershipIdentifiersSlotNext(this IWeb
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22737,7 +22695,7 @@ public static IPage<FunctionEnvelope> ListInstanceFunctionsSlotNext(this IWebApp
             /// List the functions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List the functions for a web site, or a deployment slot.
+            /// Description for List the functions for a web site, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22760,7 +22718,7 @@ public static IPage<FunctionEnvelope> ListInstanceFunctionsSlotNext(this IWebApp
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22777,7 +22735,7 @@ public static IPage<HostNameBinding> ListHostNameBindingsSlotNext(this IWebAppsO
             /// Get hostname bindings for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get hostname bindings for an app or a deployment slot.
+            /// Description for Get hostname bindings for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22800,7 +22758,7 @@ public static IPage<HostNameBinding> ListHostNameBindingsSlotNext(this IWebAppsO
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22817,7 +22775,7 @@ public static IPage<SiteInstance> ListInstanceIdentifiersSlotNext(this IWebAppsO
             /// Gets all scale-out instances of an app.
             /// </summary>
             /// <remarks>
-            /// Gets all scale-out instances of an app.
+            /// Description for Gets all scale-out instances of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22841,8 +22799,8 @@ public static IPage<SiteInstance> ListInstanceIdentifiersSlotNext(this IWebAppsO
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22860,8 +22818,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesSlotNext(this IWebAppsOper
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22885,8 +22843,8 @@ public static IPage<ProcessInfo> ListInstanceProcessesSlotNext(this IWebAppsOper
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22904,8 +22862,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesSlotNext(this I
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22929,8 +22887,8 @@ public static IPage<ProcessModuleInfo> ListInstanceProcessModulesSlotNext(this I
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22948,8 +22906,8 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlotNext(this I
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -22969,50 +22927,10 @@ public static IPage<ProcessThreadInfo> ListInstanceProcessThreadsSlotNext(this I
             }
 
             /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </summary>
-            /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlotNext(this IWebAppsOperations operations, string nextPageLink)
-            {
-                return operations.ListMetricDefinitionsSlotNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </summary>
-            /// <remarks>
-            /// Gets all metric definitions of an app (or deployment slot, if specified).
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<ResourceMetricDefinition>> ListMetricDefinitionsSlotNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListMetricDefinitionsSlotNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23020,16 +22938,16 @@ public static IPage<ResourceMetricDefinition> ListMetricDefinitionsSlotNext(this
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<ResourceMetric> ListMetricsSlotNext(this IWebAppsOperations operations, string nextPageLink)
+            public static IPage<BackupItem> ListSiteBackupsSlotNext(this IWebAppsOperations operations, string nextPageLink)
             {
-                return operations.ListMetricsSlotNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListSiteBackupsSlotNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Gets existing backups of an app.
             /// </summary>
             /// <remarks>
-            /// Gets performance metrics of an app (or deployment slot, if specified).
+            /// Description for Gets existing backups of an app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23040,9 +22958,9 @@ public static IPage<ResourceMetric> ListMetricsSlotNext(this IWebAppsOperations
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<ResourceMetric>> ListMetricsSlotNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BackupItem>> ListSiteBackupsSlotNextAsync(this IWebAppsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListMetricsSlotNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListSiteBackupsSlotNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
@@ -23052,7 +22970,7 @@ public static IPage<ResourceMetric> ListMetricsSlotNext(this IWebAppsOperations
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23069,7 +22987,7 @@ public static IPage<PerfMonResponse> ListPerfMonCountersSlotNext(this IWebAppsOp
             /// Gets perfmon counters for web app.
             /// </summary>
             /// <remarks>
-            /// Gets perfmon counters for web app.
+            /// Description for Gets perfmon counters for web app.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23093,8 +23011,8 @@ public static IPage<PerfMonResponse> ListPerfMonCountersSlotNext(this IWebAppsOp
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23112,8 +23030,8 @@ public static IPage<ProcessInfo> ListProcessesSlotNext(this IWebAppsOperations o
             /// specific scaled-out instance in a web site.
             /// </summary>
             /// <remarks>
-            /// Get list of processes for a web site, or a deployment slot, or for a
-            /// specific scaled-out instance in a web site.
+            /// Description for Get list of processes for a web site, or a deployment slot,
+            /// or for a specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23137,8 +23055,8 @@ public static IPage<ProcessInfo> ListProcessesSlotNext(this IWebAppsOperations o
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23156,8 +23074,8 @@ public static IPage<ProcessModuleInfo> ListProcessModulesSlotNext(this IWebAppsO
             /// instance in a web site.
             /// </summary>
             /// <remarks>
-            /// List module information for a process by its ID for a specific scaled-out
-            /// instance in a web site.
+            /// Description for List module information for a process by its ID for a
+            /// specific scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23181,8 +23099,8 @@ public static IPage<ProcessModuleInfo> ListProcessModulesSlotNext(this IWebAppsO
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23200,8 +23118,8 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsSlotNext(this IWebAppsO
             /// in a web site.
             /// </summary>
             /// <remarks>
-            /// List the threads in a process by its ID for a specific scaled-out instance
-            /// in a web site.
+            /// Description for List the threads in a process by its ID for a specific
+            /// scaled-out instance in a web site.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23224,7 +23142,7 @@ public static IPage<ProcessThreadInfo> ListProcessThreadsSlotNext(this IWebAppsO
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23241,7 +23159,7 @@ public static IPage<PublicCertificate> ListPublicCertificatesSlotNext(this IWebA
             /// Get public certificates for an app or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get public certificates for an app or a deployment slot.
+            /// Description for Get public certificates for an app or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23264,7 +23182,8 @@ public static IPage<PublicCertificate> ListPublicCertificatesSlotNext(this IWebA
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23281,7 +23200,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlotNext(this IWebAppsO
             /// Get list of siteextensions for a web site, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// Get list of siteextensions for a web site, or a deployment slot.
+            /// Description for Get list of siteextensions for a web site, or a deployment
+            /// slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23304,7 +23224,8 @@ public static IPage<SiteExtensionInfo> ListSiteExtensionsSlotNext(this IWebAppsO
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23321,7 +23242,8 @@ public static IPage<SlotDifference> ListSlotDifferencesSlotNext(this IWebAppsOpe
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23344,7 +23266,7 @@ public static IPage<SlotDifference> ListSlotDifferencesSlotNext(this IWebAppsOpe
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23361,7 +23283,7 @@ public static IPage<Snapshot> ListSnapshotsSlotNext(this IWebAppsOperations oper
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23384,7 +23306,8 @@ public static IPage<Snapshot> ListSnapshotsSlotNext(this IWebAppsOperations oper
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23401,7 +23324,8 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondarySlotNext(this IWebApps
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23424,7 +23348,7 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondarySlotNext(this IWebApps
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23441,7 +23365,7 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsSlotNext(this IWebAppsO
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23464,7 +23388,8 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsSlotNext(this IWebAppsO
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23481,7 +23406,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlotNext(this
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23505,8 +23431,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistorySlotNext(this
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23524,8 +23450,8 @@ public static IPage<CsmUsageQuota> ListUsagesSlotNext(this IWebAppsOperations op
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23548,7 +23474,7 @@ public static IPage<CsmUsageQuota> ListUsagesSlotNext(this IWebAppsOperations op
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23565,7 +23491,7 @@ public static IPage<WebJob> ListWebJobsSlotNext(this IWebAppsOperations operatio
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23588,7 +23514,8 @@ public static IPage<WebJob> ListWebJobsSlotNext(this IWebAppsOperations operatio
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23605,7 +23532,8 @@ public static IPage<SlotDifference> ListSlotDifferencesFromProductionNext(this I
             /// Get the difference in configuration settings between two web app slots.
             /// </summary>
             /// <remarks>
-            /// Get the difference in configuration settings between two web app slots.
+            /// Description for Get the difference in configuration settings between two
+            /// web app slots.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23628,7 +23556,7 @@ public static IPage<SlotDifference> ListSlotDifferencesFromProductionNext(this I
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23645,7 +23573,7 @@ public static IPage<Snapshot> ListSnapshotsNext(this IWebAppsOperations operatio
             /// Returns all Snapshots to the user.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user.
+            /// Description for Returns all Snapshots to the user.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23668,7 +23596,8 @@ public static IPage<Snapshot> ListSnapshotsNext(this IWebAppsOperations operatio
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23685,7 +23614,8 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondaryNext(this IWebAppsOper
             /// Returns all Snapshots to the user from DRSecondary endpoint.
             /// </summary>
             /// <remarks>
-            /// Returns all Snapshots to the user from DRSecondary endpoint.
+            /// Description for Returns all Snapshots to the user from DRSecondary
+            /// endpoint.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23708,7 +23638,7 @@ public static IPage<Snapshot> ListSnapshotsFromDRSecondaryNext(this IWebAppsOper
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23725,7 +23655,7 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsNext(this IWebAppsOpera
             /// List triggered web jobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List triggered web jobs for an app, or a deployment slot.
+            /// Description for List triggered web jobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23748,7 +23678,8 @@ public static IPage<TriggeredWebJob> ListTriggeredWebJobsNext(this IWebAppsOpera
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23765,7 +23696,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistoryNext(this IWe
             /// List a triggered web job's history for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List a triggered web job's history for an app, or a deployment slot.
+            /// Description for List a triggered web job's history for an app, or a
+            /// deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23789,8 +23721,8 @@ public static IPage<TriggeredJobHistory> ListTriggeredWebJobHistoryNext(this IWe
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23808,8 +23740,8 @@ public static IPage<CsmUsageQuota> ListUsagesNext(this IWebAppsOperations operat
             /// specified).
             /// </summary>
             /// <remarks>
-            /// Gets the quota usage information of an app (or deployment slot, if
-            /// specified).
+            /// Description for Gets the quota usage information of an app (or deployment
+            /// slot, if specified).
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23832,7 +23764,7 @@ public static IPage<CsmUsageQuota> ListUsagesNext(this IWebAppsOperations operat
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -23849,7 +23781,7 @@ public static IPage<WebJob> ListWebJobsNext(this IWebAppsOperations operations,
             /// List webjobs for an app, or a deployment slot.
             /// </summary>
             /// <remarks>
-            /// List webjobs for an app, or a deployment slot.
+            /// Description for List webjobs for an app, or a deployment slot.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs
index 98d00d3bdbd9..725be80d923b 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClient.cs
@@ -54,6 +54,11 @@ public partial class WebSiteManagementClient : ServiceClient<WebSiteManagementCl
         /// </summary>
         public string SubscriptionId { get; set; }
 
+        /// <summary>
+        /// API Version
+        /// </summary>
+        public string ApiVersion { get; private set; }
+
         /// <summary>
         /// The preferred language for the response.
         /// </summary>
@@ -398,6 +403,7 @@ private void Initialize()
             AppServicePlans = new AppServicePlansOperations(this);
             ResourceHealthMetadata = new ResourceHealthMetadataOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
+            ApiVersion = "2019-08-01";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;
@@ -435,7 +441,7 @@ private void Initialize()
         /// Gets publishing user
         /// </summary>
         /// <remarks>
-        /// Gets publishing user
+        /// Description for Gets publishing user
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -449,12 +455,21 @@ private void Initialize()
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
         public async Task<AzureOperationResponse<User>> GetPublishingUserWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -462,7 +477,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetPublishingUser", tracingParameters);
             }
@@ -470,9 +484,9 @@ private void Initialize()
             var _baseUrl = BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/publishingUsers/web").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -598,7 +612,7 @@ private void Initialize()
         /// Updates publishing user
         /// </summary>
         /// <remarks>
-        /// Updates publishing user
+        /// Description for Updates publishing user
         /// </remarks>
         /// <param name='userDetails'>
         /// Details of publishing user
@@ -634,7 +648,10 @@ private void Initialize()
             {
                 userDetails.Validate();
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -643,7 +660,6 @@ private void Initialize()
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("userDetails", userDetails);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdatePublishingUser", tracingParameters);
             }
@@ -651,9 +667,9 @@ private void Initialize()
             var _baseUrl = BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/publishingUsers/web").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -785,7 +801,7 @@ private void Initialize()
         /// Gets the source controls available for Azure websites.
         /// </summary>
         /// <remarks>
-        /// Gets the source controls available for Azure websites.
+        /// Description for Gets the source controls available for Azure websites.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -799,12 +815,21 @@ private void Initialize()
         /// <exception cref="SerializationException">
         /// Thrown when unable to deserialize the response
         /// </exception>
+        /// <exception cref="ValidationException">
+        /// Thrown when a required parameter is null
+        /// </exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// Thrown when a required parameter is null
+        /// </exception>
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
         public async Task<AzureOperationResponse<IPage<SourceControl>>> ListSourceControlsWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -812,7 +837,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSourceControls", tracingParameters);
             }
@@ -820,9 +844,9 @@ private void Initialize()
             var _baseUrl = BaseUri.AbsoluteUri;
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/sourcecontrols").ToString();
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -948,7 +972,7 @@ private void Initialize()
         /// Gets source control token
         /// </summary>
         /// <remarks>
-        /// Gets source control token
+        /// Description for Gets source control token
         /// </remarks>
         /// <param name='sourceControlType'>
         /// Type of source control
@@ -980,7 +1004,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "sourceControlType");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -989,7 +1016,6 @@ private void Initialize()
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("sourceControlType", sourceControlType);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSourceControl", tracingParameters);
             }
@@ -998,9 +1024,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/sourcecontrols/{sourceControlType}").ToString();
             _url = _url.Replace("{sourceControlType}", System.Uri.EscapeDataString(sourceControlType));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1126,7 +1152,7 @@ private void Initialize()
         /// Updates source control token
         /// </summary>
         /// <remarks>
-        /// Updates source control token
+        /// Description for Updates source control token
         /// </remarks>
         /// <param name='sourceControlType'>
         /// Type of source control
@@ -1165,7 +1191,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "requestMessage");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1175,7 +1204,6 @@ private void Initialize()
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("sourceControlType", sourceControlType);
                 tracingParameters.Add("requestMessage", requestMessage);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "UpdateSourceControl", tracingParameters);
             }
@@ -1184,9 +1212,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Web/sourcecontrols/{sourceControlType}").ToString();
             _url = _url.Replace("{sourceControlType}", System.Uri.EscapeDataString(sourceControlType));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1318,7 +1346,7 @@ private void Initialize()
         /// Gets a list of meters for a given location.
         /// </summary>
         /// <remarks>
-        /// Gets a list of meters for a given location.
+        /// Description for Gets a list of meters for a given location.
         /// </remarks>
         /// <param name='billingLocation'>
         /// Azure Location of billable resource
@@ -1353,7 +1381,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1363,7 +1394,6 @@ private void Initialize()
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingLocation", billingLocation);
                 tracingParameters.Add("osType", osType);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListBillingMeters", tracingParameters);
             }
@@ -1380,9 +1410,9 @@ private void Initialize()
             {
                 _queryParameters.Add(string.Format("osType={0}", System.Uri.EscapeDataString(osType)));
             }
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1508,7 +1538,7 @@ private void Initialize()
         /// Check if a resource name is available.
         /// </summary>
         /// <remarks>
-        /// Check if a resource name is available.
+        /// Description for Check if a resource name is available.
         /// </remarks>
         /// <param name='name'>
         /// Resource name to verify.
@@ -1549,6 +1579,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             if (name == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "name");
@@ -1557,7 +1591,6 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "type");
             }
-            string apiVersion = "2018-02-01";
             ResourceNameAvailabilityRequest request = new ResourceNameAvailabilityRequest();
             if (name != null || type != null || isFqdn != null)
             {
@@ -1572,7 +1605,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("request", request);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "CheckNameAvailability", tracingParameters);
@@ -1582,9 +1614,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/checknameavailability").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1716,7 +1748,7 @@ private void Initialize()
         /// Gets list of available geo regions plus ministamps
         /// </summary>
         /// <remarks>
-        /// Gets list of available geo regions plus ministamps
+        /// Description for Gets list of available geo regions plus ministamps
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1745,7 +1777,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1753,7 +1788,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "GetSubscriptionDeploymentLocations", tracingParameters);
             }
@@ -1762,9 +1796,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/deploymentLocations").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -1890,7 +1924,7 @@ private void Initialize()
         /// Get a list of available geographical regions.
         /// </summary>
         /// <remarks>
-        /// Get a list of available geographical regions.
+        /// Description for Get a list of available geographical regions.
         /// </remarks>
         /// <param name='sku'>
         /// Name of SKU used to filter the regions. Possible values include: 'Free',
@@ -1936,7 +1970,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1948,7 +1985,6 @@ private void Initialize()
                 tracingParameters.Add("linuxWorkersEnabled", linuxWorkersEnabled);
                 tracingParameters.Add("xenonWorkersEnabled", xenonWorkersEnabled);
                 tracingParameters.Add("linuxDynamicWorkersEnabled", linuxDynamicWorkersEnabled);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListGeoRegions", tracingParameters);
             }
@@ -1973,9 +2009,9 @@ private void Initialize()
             {
                 _queryParameters.Add(string.Format("linuxDynamicWorkersEnabled={0}", System.Uri.EscapeDataString(SafeJsonConvert.SerializeObject(linuxDynamicWorkersEnabled, SerializationSettings).Trim('"'))));
             }
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2101,7 +2137,7 @@ private void Initialize()
         /// List all apps that are assigned to a hostname.
         /// </summary>
         /// <remarks>
-        /// List all apps that are assigned to a hostname.
+        /// Description for List all apps that are assigned to a hostname.
         /// </remarks>
         /// <param name='nameIdentifier'>
         /// Hostname information.
@@ -2137,7 +2173,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2146,7 +2185,6 @@ private void Initialize()
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nameIdentifier", nameIdentifier);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSiteIdentifiersAssignedToHostName", tracingParameters);
             }
@@ -2155,9 +2193,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/listSitesAssignedToHostName").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2289,7 +2327,7 @@ private void Initialize()
         /// List all premier add-on offers.
         /// </summary>
         /// <remarks>
-        /// List all premier add-on offers.
+        /// Description for List all premier add-on offers.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2318,7 +2356,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2326,7 +2367,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListPremierAddOnOffers", tracingParameters);
             }
@@ -2335,9 +2375,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/premieraddonoffers").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2463,7 +2503,7 @@ private void Initialize()
         /// List all SKUs.
         /// </summary>
         /// <remarks>
-        /// List all SKUs.
+        /// Description for List all SKUs.
         /// </remarks>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2492,7 +2532,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2500,7 +2543,6 @@ private void Initialize()
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListSkus", tracingParameters);
             }
@@ -2509,9 +2551,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/skus").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2638,8 +2680,8 @@ private void Initialize()
         /// analyzing the Network Security Group rules.
         /// </summary>
         /// <remarks>
-        /// Verifies if this VNET is compatible with an App Service Environment by
-        /// analyzing the Network Security Group rules.
+        /// Description for Verifies if this VNET is compatible with an App Service
+        /// Environment by analyzing the Network Security Group rules.
         /// </remarks>
         /// <param name='parameters'>
         /// VNET information
@@ -2675,7 +2717,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2684,7 +2729,6 @@ private void Initialize()
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("parameters", parameters);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "VerifyHostingEnvironmentVnet", tracingParameters);
             }
@@ -2693,9 +2737,9 @@ private void Initialize()
             var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Web/verifyHostingEnvironmentVnet").ToString();
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2827,7 +2871,7 @@ private void Initialize()
         /// Move resources between resource groups.
         /// </summary>
         /// <remarks>
-        /// Move resources between resource groups.
+        /// Description for Move resources between resource groups.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -2841,7 +2885,7 @@ private void Initialize()
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -2886,7 +2930,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -2896,7 +2943,6 @@ private void Initialize()
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("moveResourceEnvelope", moveResourceEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Move", tracingParameters);
             }
@@ -2906,9 +2952,9 @@ private void Initialize()
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -2976,14 +3022,13 @@ private void Initialize()
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, DeserializationSettings);
+                    DefaultErrorResponse _errorBody =  SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -2993,10 +3038,6 @@ private void Initialize()
                 }
                 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);
@@ -3027,7 +3068,7 @@ private void Initialize()
         /// Validate if a resource can be created.
         /// </summary>
         /// <remarks>
-        /// Validate if a resource can be created.
+        /// Description for Validate if a resource can be created.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3089,7 +3130,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3099,7 +3143,6 @@ private void Initialize()
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("validateRequest", validateRequest);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Validate", tracingParameters);
             }
@@ -3109,9 +3152,9 @@ private void Initialize()
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3239,222 +3282,11 @@ private void Initialize()
             return _result;
         }
 
-        /// <summary>
-        /// Validate if the container settings are correct.
-        /// </summary>
-        /// <remarks>
-        /// Validate if the container settings are correct.
-        /// </remarks>
-        /// <param name='validateContainerSettingsRequest'>
-        /// </param>
-        /// <param name='resourceGroupName'>
-        /// Name of the resource group to which the resource belongs.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="DefaultErrorResponseException">
-        /// Thrown when the operation returned an invalid status code
-        /// </exception>
-        /// <exception cref="SerializationException">
-        /// Thrown when unable to deserialize the response
-        /// </exception>
-        /// <exception cref="ValidationException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        /// <return>
-        /// A response object containing the response body and response headers.
-        /// </return>
-        public async Task<AzureOperationResponse<object>> ValidateContainerSettingsWithHttpMessagesAsync(ValidateContainerSettingsRequest validateContainerSettingsRequest, string resourceGroupName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (validateContainerSettingsRequest == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "validateContainerSettingsRequest");
-            }
-            if (resourceGroupName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
-            }
-            if (resourceGroupName != null)
-            {
-                if (resourceGroupName.Length > 90)
-                {
-                    throw new ValidationException(ValidationRules.MaxLength, "resourceGroupName", 90);
-                }
-                if (resourceGroupName.Length < 1)
-                {
-                    throw new ValidationException(ValidationRules.MinLength, "resourceGroupName", 1);
-                }
-                if (!System.Text.RegularExpressions.Regex.IsMatch(resourceGroupName, "^[-\\w\\._\\(\\)]+[^\\.]$"))
-                {
-                    throw new ValidationException(ValidationRules.Pattern, "resourceGroupName", "^[-\\w\\._\\(\\)]+[^\\.]$");
-                }
-            }
-            if (SubscriptionId == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
-            }
-            string apiVersion = "2018-02-01";
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("validateContainerSettingsRequest", validateContainerSettingsRequest);
-                tracingParameters.Add("resourceGroupName", resourceGroupName);
-                tracingParameters.Add("apiVersion", apiVersion);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ValidateContainerSettings", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Web/validateContainerSettings").ToString();
-            _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
-            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
-            List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
-            }
-            if (_queryParameters.Count > 0)
-            {
-                _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
-            }
-            // Create HTTP transport objects
-            var _httpRequest = new HttpRequestMessage();
-            HttpResponseMessage _httpResponse = null;
-            _httpRequest.Method = new HttpMethod("POST");
-            _httpRequest.RequestUri = new System.Uri(_url);
-            // Set Headers
-            if (GenerateClientRequestId != null && GenerateClientRequestId.Value)
-            {
-                _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
-            }
-            if (AcceptLanguage != null)
-            {
-                if (_httpRequest.Headers.Contains("accept-language"))
-                {
-                    _httpRequest.Headers.Remove("accept-language");
-                }
-                _httpRequest.Headers.TryAddWithoutValidation("accept-language", AcceptLanguage);
-            }
-
-
-            if (customHeaders != null)
-            {
-                foreach(var _header in customHeaders)
-                {
-                    if (_httpRequest.Headers.Contains(_header.Key))
-                    {
-                        _httpRequest.Headers.Remove(_header.Key);
-                    }
-                    _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
-                }
-            }
-
-            // Serialize Request
-            string _requestContent = null;
-            if(validateContainerSettingsRequest != null)
-            {
-                _requestContent = SafeJsonConvert.SerializeObject(validateContainerSettingsRequest, SerializationSettings);
-                _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8);
-                _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            }
-            // Set Credentials
-            if (Credentials != null)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            }
-            // Send Request
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
-            }
-            cancellationToken.ThrowIfCancellationRequested();
-            _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
-            }
-            HttpStatusCode _statusCode = _httpResponse.StatusCode;
-            cancellationToken.ThrowIfCancellationRequested();
-            string _responseContent = null;
-            if ((int)_statusCode != 200)
-            {
-                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    DefaultErrorResponse _errorBody =  SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, DeserializationSettings);
-                    if (_errorBody != null)
-                    {
-                        ex.Body = _errorBody;
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore the exception
-                }
-                ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
-                ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
-                if (_shouldTrace)
-                {
-                    ServiceClientTracing.Error(_invocationId, ex);
-                }
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw ex;
-            }
-            // Create Result
-            var _result = new AzureOperationResponse<object>();
-            _result.Request = _httpRequest;
-            _result.Response = _httpResponse;
-            if (_httpResponse.Headers.Contains("x-ms-request-id"))
-            {
-                _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
-            }
-            // Deserialize Response
-            if ((int)_statusCode == 200)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = SafeJsonConvert.DeserializeObject<object>(_responseContent, DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
         /// <summary>
         /// Validate whether a resource can be moved.
         /// </summary>
         /// <remarks>
-        /// Validate whether a resource can be moved.
+        /// Description for Validate whether a resource can be moved.
         /// </remarks>
         /// <param name='resourceGroupName'>
         /// Name of the resource group to which the resource belongs.
@@ -3468,7 +3300,7 @@ private void Initialize()
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        /// <exception cref="CloudException">
+        /// <exception cref="DefaultErrorResponseException">
         /// Thrown when the operation returned an invalid status code
         /// </exception>
         /// <exception cref="ValidationException">
@@ -3513,7 +3345,10 @@ private void Initialize()
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.SubscriptionId");
             }
-            string apiVersion = "2018-02-01";
+            if (ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.ApiVersion");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -3523,7 +3358,6 @@ private void Initialize()
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("resourceGroupName", resourceGroupName);
                 tracingParameters.Add("moveResourceEnvelope", moveResourceEnvelope);
-                tracingParameters.Add("apiVersion", apiVersion);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ValidateMove", tracingParameters);
             }
@@ -3533,9 +3367,9 @@ private void Initialize()
             _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
             _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(SubscriptionId));
             List<string> _queryParameters = new List<string>();
-            if (apiVersion != null)
+            if (ApiVersion != null)
             {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion)));
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(ApiVersion)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -3603,14 +3437,13 @@ private void Initialize()
             string _responseContent = null;
             if ((int)_statusCode != 204)
             {
-                var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                var ex = new DefaultErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
                 {
                     _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    CloudError _errorBody =  SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, DeserializationSettings);
+                    DefaultErrorResponse _errorBody =  SafeJsonConvert.DeserializeObject<DefaultErrorResponse>(_responseContent, DeserializationSettings);
                     if (_errorBody != null)
                     {
-                        ex = new CloudException(_errorBody.Message);
                         ex.Body = _errorBody;
                     }
                 }
@@ -3620,10 +3453,6 @@ private void Initialize()
                 }
                 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);
@@ -3654,7 +3483,7 @@ private void Initialize()
         /// Gets the source controls available for Azure websites.
         /// </summary>
         /// <remarks>
-        /// Gets the source controls available for Azure websites.
+        /// Description for Gets the source controls available for Azure websites.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3825,7 +3654,7 @@ private void Initialize()
         /// Gets a list of meters for a given location.
         /// </summary>
         /// <remarks>
-        /// Gets a list of meters for a given location.
+        /// Description for Gets a list of meters for a given location.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -3996,7 +3825,7 @@ private void Initialize()
         /// Get a list of available geographical regions.
         /// </summary>
         /// <remarks>
-        /// Get a list of available geographical regions.
+        /// Description for Get a list of available geographical regions.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -4167,7 +3996,7 @@ private void Initialize()
         /// List all apps that are assigned to a hostname.
         /// </summary>
         /// <remarks>
-        /// List all apps that are assigned to a hostname.
+        /// Description for List all apps that are assigned to a hostname.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -4338,7 +4167,7 @@ private void Initialize()
         /// List all premier add-on offers.
         /// </summary>
         /// <remarks>
-        /// List all premier add-on offers.
+        /// Description for List all premier add-on offers.
         /// </remarks>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClientExtensions.cs b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClientExtensions.cs
index 78cdd7ca8fc6..ef734c7a7f7b 100644
--- a/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClientExtensions.cs
+++ b/sdk/websites/Microsoft.Azure.Management.WebSites/src/Generated/WebSiteManagementClientExtensions.cs
@@ -25,7 +25,7 @@ public static partial class WebSiteManagementClientExtensions
             /// Gets publishing user
             /// </summary>
             /// <remarks>
-            /// Gets publishing user
+            /// Description for Gets publishing user
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -39,7 +39,7 @@ public static User GetPublishingUser(this IWebSiteManagementClient operations)
             /// Gets publishing user
             /// </summary>
             /// <remarks>
-            /// Gets publishing user
+            /// Description for Gets publishing user
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -59,7 +59,7 @@ public static User GetPublishingUser(this IWebSiteManagementClient operations)
             /// Updates publishing user
             /// </summary>
             /// <remarks>
-            /// Updates publishing user
+            /// Description for Updates publishing user
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -76,7 +76,7 @@ public static User UpdatePublishingUser(this IWebSiteManagementClient operations
             /// Updates publishing user
             /// </summary>
             /// <remarks>
-            /// Updates publishing user
+            /// Description for Updates publishing user
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -99,7 +99,7 @@ public static User UpdatePublishingUser(this IWebSiteManagementClient operations
             /// Gets the source controls available for Azure websites.
             /// </summary>
             /// <remarks>
-            /// Gets the source controls available for Azure websites.
+            /// Description for Gets the source controls available for Azure websites.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -113,7 +113,7 @@ public static IPage<SourceControl> ListSourceControls(this IWebSiteManagementCli
             /// Gets the source controls available for Azure websites.
             /// </summary>
             /// <remarks>
-            /// Gets the source controls available for Azure websites.
+            /// Description for Gets the source controls available for Azure websites.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -133,7 +133,7 @@ public static IPage<SourceControl> ListSourceControls(this IWebSiteManagementCli
             /// Gets source control token
             /// </summary>
             /// <remarks>
-            /// Gets source control token
+            /// Description for Gets source control token
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -150,7 +150,7 @@ public static SourceControl GetSourceControl(this IWebSiteManagementClient opera
             /// Gets source control token
             /// </summary>
             /// <remarks>
-            /// Gets source control token
+            /// Description for Gets source control token
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -173,7 +173,7 @@ public static SourceControl GetSourceControl(this IWebSiteManagementClient opera
             /// Updates source control token
             /// </summary>
             /// <remarks>
-            /// Updates source control token
+            /// Description for Updates source control token
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -193,7 +193,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Updates source control token
             /// </summary>
             /// <remarks>
-            /// Updates source control token
+            /// Description for Updates source control token
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -219,7 +219,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Gets a list of meters for a given location.
             /// </summary>
             /// <remarks>
-            /// Gets a list of meters for a given location.
+            /// Description for Gets a list of meters for a given location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -239,7 +239,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Gets a list of meters for a given location.
             /// </summary>
             /// <remarks>
-            /// Gets a list of meters for a given location.
+            /// Description for Gets a list of meters for a given location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -265,7 +265,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Check if a resource name is available.
             /// </summary>
             /// <remarks>
-            /// Check if a resource name is available.
+            /// Description for Check if a resource name is available.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -291,7 +291,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Check if a resource name is available.
             /// </summary>
             /// <remarks>
-            /// Check if a resource name is available.
+            /// Description for Check if a resource name is available.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -323,7 +323,7 @@ public static SourceControl UpdateSourceControl(this IWebSiteManagementClient op
             /// Gets list of available geo regions plus ministamps
             /// </summary>
             /// <remarks>
-            /// Gets list of available geo regions plus ministamps
+            /// Description for Gets list of available geo regions plus ministamps
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -337,7 +337,7 @@ public static DeploymentLocations GetSubscriptionDeploymentLocations(this IWebSi
             /// Gets list of available geo regions plus ministamps
             /// </summary>
             /// <remarks>
-            /// Gets list of available geo regions plus ministamps
+            /// Description for Gets list of available geo regions plus ministamps
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -357,7 +357,7 @@ public static DeploymentLocations GetSubscriptionDeploymentLocations(this IWebSi
             /// Get a list of available geographical regions.
             /// </summary>
             /// <remarks>
-            /// Get a list of available geographical regions.
+            /// Description for Get a list of available geographical regions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -388,7 +388,7 @@ public static DeploymentLocations GetSubscriptionDeploymentLocations(this IWebSi
             /// Get a list of available geographical regions.
             /// </summary>
             /// <remarks>
-            /// Get a list of available geographical regions.
+            /// Description for Get a list of available geographical regions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -425,7 +425,7 @@ public static DeploymentLocations GetSubscriptionDeploymentLocations(this IWebSi
             /// List all apps that are assigned to a hostname.
             /// </summary>
             /// <remarks>
-            /// List all apps that are assigned to a hostname.
+            /// Description for List all apps that are assigned to a hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -442,7 +442,7 @@ public static IPage<Identifier> ListSiteIdentifiersAssignedToHostName(this IWebS
             /// List all apps that are assigned to a hostname.
             /// </summary>
             /// <remarks>
-            /// List all apps that are assigned to a hostname.
+            /// Description for List all apps that are assigned to a hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -465,7 +465,7 @@ public static IPage<Identifier> ListSiteIdentifiersAssignedToHostName(this IWebS
             /// List all premier add-on offers.
             /// </summary>
             /// <remarks>
-            /// List all premier add-on offers.
+            /// Description for List all premier add-on offers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -479,7 +479,7 @@ public static IPage<PremierAddOnOffer> ListPremierAddOnOffers(this IWebSiteManag
             /// List all premier add-on offers.
             /// </summary>
             /// <remarks>
-            /// List all premier add-on offers.
+            /// Description for List all premier add-on offers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -499,7 +499,7 @@ public static IPage<PremierAddOnOffer> ListPremierAddOnOffers(this IWebSiteManag
             /// List all SKUs.
             /// </summary>
             /// <remarks>
-            /// List all SKUs.
+            /// Description for List all SKUs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -513,7 +513,7 @@ public static SkuInfos ListSkus(this IWebSiteManagementClient operations)
             /// List all SKUs.
             /// </summary>
             /// <remarks>
-            /// List all SKUs.
+            /// Description for List all SKUs.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -534,8 +534,8 @@ public static SkuInfos ListSkus(this IWebSiteManagementClient operations)
             /// analyzing the Network Security Group rules.
             /// </summary>
             /// <remarks>
-            /// Verifies if this VNET is compatible with an App Service Environment by
-            /// analyzing the Network Security Group rules.
+            /// Description for Verifies if this VNET is compatible with an App Service
+            /// Environment by analyzing the Network Security Group rules.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -553,8 +553,8 @@ public static VnetValidationFailureDetails VerifyHostingEnvironmentVnet(this IWe
             /// analyzing the Network Security Group rules.
             /// </summary>
             /// <remarks>
-            /// Verifies if this VNET is compatible with an App Service Environment by
-            /// analyzing the Network Security Group rules.
+            /// Description for Verifies if this VNET is compatible with an App Service
+            /// Environment by analyzing the Network Security Group rules.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -577,7 +577,7 @@ public static VnetValidationFailureDetails VerifyHostingEnvironmentVnet(this IWe
             /// Move resources between resource groups.
             /// </summary>
             /// <remarks>
-            /// Move resources between resource groups.
+            /// Description for Move resources between resource groups.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -597,7 +597,7 @@ public static void Move(this IWebSiteManagementClient operations, string resourc
             /// Move resources between resource groups.
             /// </summary>
             /// <remarks>
-            /// Move resources between resource groups.
+            /// Description for Move resources between resource groups.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -620,7 +620,7 @@ public static void Move(this IWebSiteManagementClient operations, string resourc
             /// Validate if a resource can be created.
             /// </summary>
             /// <remarks>
-            /// Validate if a resource can be created.
+            /// Description for Validate if a resource can be created.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -640,7 +640,7 @@ public static ValidateResponse Validate(this IWebSiteManagementClient operations
             /// Validate if a resource can be created.
             /// </summary>
             /// <remarks>
-            /// Validate if a resource can be created.
+            /// Description for Validate if a resource can be created.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -662,55 +662,11 @@ public static ValidateResponse Validate(this IWebSiteManagementClient operations
                 }
             }
 
-            /// <summary>
-            /// Validate if the container settings are correct.
-            /// </summary>
-            /// <remarks>
-            /// Validate if the container settings are correct.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='validateContainerSettingsRequest'>
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            public static object ValidateContainerSettings(this IWebSiteManagementClient operations, ValidateContainerSettingsRequest validateContainerSettingsRequest, string resourceGroupName)
-            {
-                return operations.ValidateContainerSettingsAsync(validateContainerSettingsRequest, resourceGroupName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Validate if the container settings are correct.
-            /// </summary>
-            /// <remarks>
-            /// Validate if the container settings are correct.
-            /// </remarks>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='validateContainerSettingsRequest'>
-            /// </param>
-            /// <param name='resourceGroupName'>
-            /// Name of the resource group to which the resource belongs.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<object> ValidateContainerSettingsAsync(this IWebSiteManagementClient operations, ValidateContainerSettingsRequest validateContainerSettingsRequest, string resourceGroupName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ValidateContainerSettingsWithHttpMessagesAsync(validateContainerSettingsRequest, resourceGroupName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
             /// <summary>
             /// Validate whether a resource can be moved.
             /// </summary>
             /// <remarks>
-            /// Validate whether a resource can be moved.
+            /// Description for Validate whether a resource can be moved.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -730,7 +686,7 @@ public static void ValidateMove(this IWebSiteManagementClient operations, string
             /// Validate whether a resource can be moved.
             /// </summary>
             /// <remarks>
-            /// Validate whether a resource can be moved.
+            /// Description for Validate whether a resource can be moved.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -753,7 +709,7 @@ public static void ValidateMove(this IWebSiteManagementClient operations, string
             /// Gets the source controls available for Azure websites.
             /// </summary>
             /// <remarks>
-            /// Gets the source controls available for Azure websites.
+            /// Description for Gets the source controls available for Azure websites.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -770,7 +726,7 @@ public static IPage<SourceControl> ListSourceControlsNext(this IWebSiteManagemen
             /// Gets the source controls available for Azure websites.
             /// </summary>
             /// <remarks>
-            /// Gets the source controls available for Azure websites.
+            /// Description for Gets the source controls available for Azure websites.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -793,7 +749,7 @@ public static IPage<SourceControl> ListSourceControlsNext(this IWebSiteManagemen
             /// Gets a list of meters for a given location.
             /// </summary>
             /// <remarks>
-            /// Gets a list of meters for a given location.
+            /// Description for Gets a list of meters for a given location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -810,7 +766,7 @@ public static IPage<BillingMeter> ListBillingMetersNext(this IWebSiteManagementC
             /// Gets a list of meters for a given location.
             /// </summary>
             /// <remarks>
-            /// Gets a list of meters for a given location.
+            /// Description for Gets a list of meters for a given location.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -833,7 +789,7 @@ public static IPage<BillingMeter> ListBillingMetersNext(this IWebSiteManagementC
             /// Get a list of available geographical regions.
             /// </summary>
             /// <remarks>
-            /// Get a list of available geographical regions.
+            /// Description for Get a list of available geographical regions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -850,7 +806,7 @@ public static IPage<GeoRegion> ListGeoRegionsNext(this IWebSiteManagementClient
             /// Get a list of available geographical regions.
             /// </summary>
             /// <remarks>
-            /// Get a list of available geographical regions.
+            /// Description for Get a list of available geographical regions.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -873,7 +829,7 @@ public static IPage<GeoRegion> ListGeoRegionsNext(this IWebSiteManagementClient
             /// List all apps that are assigned to a hostname.
             /// </summary>
             /// <remarks>
-            /// List all apps that are assigned to a hostname.
+            /// Description for List all apps that are assigned to a hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -890,7 +846,7 @@ public static IPage<Identifier> ListSiteIdentifiersAssignedToHostNameNext(this I
             /// List all apps that are assigned to a hostname.
             /// </summary>
             /// <remarks>
-            /// List all apps that are assigned to a hostname.
+            /// Description for List all apps that are assigned to a hostname.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -913,7 +869,7 @@ public static IPage<Identifier> ListSiteIdentifiersAssignedToHostNameNext(this I
             /// List all premier add-on offers.
             /// </summary>
             /// <remarks>
-            /// List all premier add-on offers.
+            /// Description for List all premier add-on offers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -930,7 +886,7 @@ public static IPage<PremierAddOnOffer> ListPremierAddOnOffersNext(this IWebSiteM
             /// List all premier add-on offers.
             /// </summary>
             /// <remarks>
-            /// List all premier add-on offers.
+            /// Description for List all premier add-on offers.
             /// </remarks>
             /// <param name='operations'>
             /// The operations group for this extension method.