diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperations.cs
index 39dd36a238d12..d922a0b43aa91 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperations.cs
@@ -51,7 +51,9 @@ internal AddressOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Validates the address.
+        /// Validates an address. Use the operation to validate an address before using
+        /// it as soldTo or a billTo address.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='address'>
         /// </param>
@@ -86,6 +88,10 @@ internal AddressOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "address");
             }
+            if (address != null)
+            {
+                address.Validate();
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperationsExtensions.cs
index c0e8399bdcc2c..820680b6ba611 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AddressOperationsExtensions.cs
@@ -22,7 +22,9 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class AddressOperationsExtensions
     {
             /// <summary>
-            /// Validates the address.
+            /// Validates an address. Use the operation to validate an address before using
+            /// it as soldTo or a billTo address.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -35,7 +37,9 @@ public static ValidateAddressResponse Validate(this IAddressOperations operation
             }
 
             /// <summary>
-            /// Validates the address.
+            /// Validates an address. Use the operation to validate an address before using
+            /// it as soldTo or a billTo address.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperations.cs
index 355ab9591a9b8..1d43b32dd3954 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperations.cs
@@ -51,10 +51,11 @@ internal AgreementsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all agreements for a billing account.
+        /// Lists the agreements for a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
         /// May be used to expand the participants.
@@ -80,7 +81,7 @@ internal AgreementsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<AgreementListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Agreement>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -203,7 +204,7 @@ internal AgreementsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<AgreementListResult>();
+            var _result = new AzureOperationResponse<IPage<Agreement>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -216,7 +217,7 @@ internal AgreementsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AgreementListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Agreement>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -236,13 +237,14 @@ internal AgreementsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the agreement by name.
+        /// Gets an agreement by ID.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='agreementName'>
-        /// Agreement Id.
+        /// The ID that uniquely identifies an agreement.
         /// </param>
         /// <param name='expand'>
         /// May be used to expand the participants.
@@ -429,5 +431,174 @@ internal AgreementsOperations(BillingManagementClient client)
             return _result;
         }
 
+        /// <summary>
+        /// Lists the agreements for a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Agreement>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Agreement>>();
+            _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<Agreement>>(_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;
+        }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperationsExtensions.cs
index 459d373677610..e5377e98818aa 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AgreementsOperationsExtensions.cs
@@ -22,30 +22,32 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class AgreementsOperationsExtensions
     {
             /// <summary>
-            /// Lists all agreements for a billing account.
+            /// Lists the agreements for a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
             /// May be used to expand the participants.
             /// </param>
-            public static AgreementListResult ListByBillingAccount(this IAgreementsOperations operations, string billingAccountName, string expand = default(string))
+            public static IPage<Agreement> ListByBillingAccount(this IAgreementsOperations operations, string billingAccountName, string expand = default(string))
             {
                 return operations.ListByBillingAccountAsync(billingAccountName, expand).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all agreements for a billing account.
+            /// Lists the agreements for a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
             /// May be used to expand the participants.
@@ -53,7 +55,7 @@ public static partial class AgreementsOperationsExtensions
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<AgreementListResult> ListByBillingAccountAsync(this IAgreementsOperations operations, string billingAccountName, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Agreement>> ListByBillingAccountAsync(this IAgreementsOperations operations, string billingAccountName, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, expand, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -62,16 +64,17 @@ public static partial class AgreementsOperationsExtensions
             }
 
             /// <summary>
-            /// Get the agreement by name.
+            /// Gets an agreement by ID.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='agreementName'>
-            /// Agreement Id.
+            /// The ID that uniquely identifies an agreement.
             /// </param>
             /// <param name='expand'>
             /// May be used to expand the participants.
@@ -82,16 +85,17 @@ public static partial class AgreementsOperationsExtensions
             }
 
             /// <summary>
-            /// Get the agreement by name.
+            /// Gets an agreement by ID.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='agreementName'>
-            /// Agreement Id.
+            /// The ID that uniquely identifies an agreement.
             /// </param>
             /// <param name='expand'>
             /// May be used to expand the participants.
@@ -107,5 +111,41 @@ public static partial class AgreementsOperationsExtensions
                 }
             }
 
+            /// <summary>
+            /// Lists the agreements for a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Agreement> ListByBillingAccountNext(this IAgreementsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the agreements for a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Agreement>> ListByBillingAccountNextAsync(this IAgreementsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperations.cs
index d5c456a3192df..0d741b8bb43d9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperations.cs
@@ -51,14 +51,17 @@ internal AvailableBalancesOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// The latest available credit balance for a given billingAccountName and
-        /// billingProfileName.
+        /// The available credit balance for a billing profile. This is the balance
+        /// that can be used for pay now to settle due or past due invoices. The
+        /// operation is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -81,7 +84,7 @@ internal AvailableBalancesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<AvailableBalance>> GetByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<AvailableBalance>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
@@ -105,7 +108,7 @@ internal AvailableBalancesOperations(BillingManagementClient client)
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetByBillingProfile", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperationsExtensions.cs
index e1e1a592f1373..88f874001632d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/AvailableBalancesOperationsExtensions.cs
@@ -22,42 +22,48 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class AvailableBalancesOperationsExtensions
     {
             /// <summary>
-            /// The latest available credit balance for a given billingAccountName and
-            /// billingProfileName.
+            /// The available credit balance for a billing profile. This is the balance
+            /// that can be used for pay now to settle due or past due invoices. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            public static AvailableBalance GetByBillingProfile(this IAvailableBalancesOperations operations, string billingAccountName, string billingProfileName)
+            public static AvailableBalance Get(this IAvailableBalancesOperations operations, string billingAccountName, string billingProfileName)
             {
-                return operations.GetByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
+                return operations.GetAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// The latest available credit balance for a given billingAccountName and
-            /// billingProfileName.
+            /// The available credit balance for a billing profile. This is the balance
+            /// that can be used for pay now to settle due or past due invoices. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<AvailableBalance> GetByBillingProfileAsync(this IAvailableBalancesOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<AvailableBalance> GetAsync(this IAvailableBalancesOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperations.cs
index 53bd623684138..b2d052925aeef 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperations.cs
@@ -51,10 +51,11 @@ internal BillingAccountsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all billing accounts for a user which he has access to.
+        /// Lists the billing accounts that a user has access to.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='expand'>
-        /// May be used to expand the address, invoiceSections and billingProfiles.
+        /// May be used to expand the soldTo, invoice sections and billing profiles.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -77,7 +78,7 @@ internal BillingAccountsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingAccountListResult>> ListWithHttpMessagesAsync(string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingAccount>>> ListWithHttpMessagesAsync(string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -194,7 +195,7 @@ internal BillingAccountsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingAccountListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingAccount>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -207,7 +208,7 @@ internal BillingAccountsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingAccountListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingAccount>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -227,13 +228,14 @@ internal BillingAccountsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the billing account by id.
+        /// Gets a billing account by its ID.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the address, invoiceSections and billingProfiles.
+        /// May be used to expand the soldTo, invoice sections and billing profiles.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -412,10 +414,38 @@ internal BillingAccountsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all invoice sections with create subscription permission for a user.
+        /// Updates the properties of a billing account. Currently, displayName and
+        /// address can be updated. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing account
+        /// 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<BillingAccount>> UpdateWithHttpMessagesAsync(string billingAccountName, BillingAccountUpdateRequest parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<BillingAccount> _response = await BeginUpdateWithHttpMessagesAsync(billingAccountName, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Lists the invoice sections for which the user has permission to create
+        /// Azure subscriptions. The operation is supported only for billing accounts
+        /// with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -589,7 +619,373 @@ internal BillingAccountsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all invoice sections with create subscription permission for a user.
+        /// Updates the properties of a billing account. Currently, displayName and
+        /// address can be updated. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing account
+        /// operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingAccount>> BeginUpdateWithHttpMessagesAsync(string billingAccountName, BillingAccountUpdateRequest parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (billingAccountName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
+            }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("parameters", parameters);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginUpdate", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}").ToString();
+            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            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("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(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingAccount>();
+            _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<BillingAccount>(_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>
+        /// Lists the billing accounts that a user has access to.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingAccount>>> 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingAccount>>();
+            _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<BillingAccount>>(_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>
+        /// Lists the invoice sections for which the user has permission to create
+        /// Azure subscriptions. The operation is supported only for billing accounts
+        /// with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperationsExtensions.cs
index b9d8804580187..077b97c61b0eb 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingAccountsOperationsExtensions.cs
@@ -22,32 +22,34 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingAccountsOperationsExtensions
     {
             /// <summary>
-            /// Lists all billing accounts for a user which he has access to.
+            /// Lists the billing accounts that a user has access to.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the address, invoiceSections and billingProfiles.
+            /// May be used to expand the soldTo, invoice sections and billing profiles.
             /// </param>
-            public static BillingAccountListResult List(this IBillingAccountsOperations operations, string expand = default(string))
+            public static IPage<BillingAccount> List(this IBillingAccountsOperations operations, string expand = default(string))
             {
                 return operations.ListAsync(expand).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing accounts for a user which he has access to.
+            /// Lists the billing accounts that a user has access to.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the address, invoiceSections and billingProfiles.
+            /// May be used to expand the soldTo, invoice sections and billing profiles.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingAccountListResult> ListAsync(this IBillingAccountsOperations operations, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingAccount>> ListAsync(this IBillingAccountsOperations operations, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListWithHttpMessagesAsync(expand, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -56,16 +58,17 @@ public static partial class BillingAccountsOperationsExtensions
             }
 
             /// <summary>
-            /// Get the billing account by id.
+            /// Gets a billing account by its ID.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the address, invoiceSections and billingProfiles.
+            /// May be used to expand the soldTo, invoice sections and billing profiles.
             /// </param>
             public static BillingAccount Get(this IBillingAccountsOperations operations, string billingAccountName, string expand = default(string))
             {
@@ -73,16 +76,17 @@ public static partial class BillingAccountsOperationsExtensions
             }
 
             /// <summary>
-            /// Get the billing account by id.
+            /// Gets a billing account by its ID.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the address, invoiceSections and billingProfiles.
+            /// May be used to expand the soldTo, invoice sections and billing profiles.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -94,15 +98,64 @@ public static partial class BillingAccountsOperationsExtensions
                     return _result.Body;
                 }
             }
-        
+
+            /// <summary>
+            /// Updates the properties of a billing account. Currently, displayName and
+            /// address can be updated. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing account
+            /// operation.
+            /// </param>
+            public static BillingAccount Update(this IBillingAccountsOperations operations, string billingAccountName, BillingAccountUpdateRequest parameters)
+            {
+                return operations.UpdateAsync(billingAccountName, parameters).GetAwaiter().GetResult();
+            }
+
             /// <summary>
-            /// Lists all invoice sections with create subscription permission for a user.
+            /// Updates the properties of a billing account. Currently, displayName and
+            /// address can be updated. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing account
+            /// operation.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<BillingAccount> UpdateAsync(this IBillingAccountsOperations operations, string billingAccountName, BillingAccountUpdateRequest parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.UpdateWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoice sections for which the user has permission to create
+            /// Azure subscriptions. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             public static IPage<InvoiceSectionWithCreateSubPermission> ListInvoiceSectionsByCreateSubscriptionPermission(this IBillingAccountsOperations operations, string billingAccountName)
             {
@@ -110,13 +163,16 @@ public static IPage<InvoiceSectionWithCreateSubPermission> ListInvoiceSectionsBy
             }
 
             /// <summary>
-            /// Lists all invoice sections with create subscription permission for a user.
+            /// Lists the invoice sections for which the user has permission to create
+            /// Azure subscriptions. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -130,7 +186,92 @@ public static IPage<InvoiceSectionWithCreateSubPermission> ListInvoiceSectionsBy
             }
 
             /// <summary>
-            /// Lists all invoice sections with create subscription permission for a user.
+            /// Updates the properties of a billing account. Currently, displayName and
+            /// address can be updated. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing account
+            /// operation.
+            /// </param>
+            public static BillingAccount BeginUpdate(this IBillingAccountsOperations operations, string billingAccountName, BillingAccountUpdateRequest parameters)
+            {
+                return operations.BeginUpdateAsync(billingAccountName, parameters).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Updates the properties of a billing account. Currently, displayName and
+            /// address can be updated. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing account
+            /// operation.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<BillingAccount> BeginUpdateAsync(this IBillingAccountsOperations operations, string billingAccountName, BillingAccountUpdateRequest parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the billing accounts that a user has access to.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingAccount> ListNext(this IBillingAccountsOperations operations, string nextPageLink)
+            {
+                return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing accounts that a user has access to.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingAccount>> ListNextAsync(this IBillingAccountsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoice sections for which the user has permission to create
+            /// Azure subscriptions. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -144,7 +285,10 @@ public static IPage<InvoiceSectionWithCreateSubPermission> ListInvoiceSectionsBy
             }
 
             /// <summary>
-            /// Lists all invoice sections with create subscription permission for a user.
+            /// Lists the invoice sections for which the user has permission to create
+            /// Azure subscriptions. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingManagementClient.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingManagementClient.cs
index e380551c5058d..6792e2b316106 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingManagementClient.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingManagementClient.cs
@@ -48,13 +48,13 @@ public partial class BillingManagementClient : ServiceClient<BillingManagementCl
         public ServiceClientCredentials Credentials { get; private set; }
 
         /// <summary>
-        /// Version of the API to be used with the client request. The current version
-        /// is 2019-10-01-preview.
+        /// The version of the API to be used with the client request. The current
+        /// version is 2020-05-01.
         /// </summary>
         public string ApiVersion { get; private set; }
 
         /// <summary>
-        /// Azure Subscription ID.
+        /// The ID that uniquely identifies an Azure subscription.
         /// </summary>
         public string SubscriptionId { get; set; }
 
@@ -81,11 +81,6 @@ public partial class BillingManagementClient : ServiceClient<BillingManagementCl
         /// </summary>
         public virtual IBillingAccountsOperations BillingAccounts { get; private set; }
 
-        /// <summary>
-        /// Gets the IPaymentMethodsOperations.
-        /// </summary>
-        public virtual IPaymentMethodsOperations PaymentMethods { get; private set; }
-
         /// <summary>
         /// Gets the IAddressOperations.
         /// </summary>
@@ -96,6 +91,11 @@ public partial class BillingManagementClient : ServiceClient<BillingManagementCl
         /// </summary>
         public virtual IAvailableBalancesOperations AvailableBalances { get; private set; }
 
+        /// <summary>
+        /// Gets the IInstructionsOperations.
+        /// </summary>
+        public virtual IInstructionsOperations Instructions { get; private set; }
+
         /// <summary>
         /// Gets the IBillingProfilesOperations.
         /// </summary>
@@ -126,20 +126,15 @@ public partial class BillingManagementClient : ServiceClient<BillingManagementCl
         /// </summary>
         public virtual IProductsOperations Products { get; private set; }
 
-        /// <summary>
-        /// Gets the ITransactionsOperations.
-        /// </summary>
-        public virtual ITransactionsOperations Transactions { get; private set; }
-        
         /// <summary>
         /// Gets the IInvoicesOperations.
         /// </summary>
         public virtual IInvoicesOperations Invoices { get; private set; }
 
         /// <summary>
-        /// Gets the IPriceSheetOperations.
+        /// Gets the ITransactionsOperations.
         /// </summary>
-        public virtual IPriceSheetOperations PriceSheet { get; private set; }
+        public virtual ITransactionsOperations Transactions { get; private set; }
 
         /// <summary>
         /// Gets the IPoliciesOperations.
@@ -413,18 +408,17 @@ public BillingManagementClient(System.Uri baseUri, ServiceClientCredentials cred
         private void Initialize()
         {
             BillingAccounts = new BillingAccountsOperations(this);
-            PaymentMethods = new PaymentMethodsOperations(this);
             Address = new AddressOperations(this);
             AvailableBalances = new AvailableBalancesOperations(this);
+            Instructions = new InstructionsOperations(this);
             BillingProfiles = new BillingProfilesOperations(this);
             Customers = new CustomersOperations(this);
             InvoiceSections = new InvoiceSectionsOperations(this);
             BillingPermissions = new BillingPermissionsOperations(this);
             BillingSubscriptions = new BillingSubscriptionsOperations(this);
             Products = new ProductsOperations(this);
-            Transactions = new TransactionsOperations(this);
             Invoices = new InvoicesOperations(this);
-            PriceSheet = new PriceSheetOperations(this);
+            Transactions = new TransactionsOperations(this);
             Policies = new PoliciesOperations(this);
             BillingProperty = new BillingPropertyOperations(this);
             Operations = new Operations(this);
@@ -432,7 +426,7 @@ private void Initialize()
             BillingRoleAssignments = new BillingRoleAssignmentsOperations(this);
             Agreements = new AgreementsOperations(this);
             BaseUri = new System.Uri("https://management.azure.com");
-            ApiVersion = "2019-10-01-preview";
+            ApiVersion = "2020-05-01";
             AcceptLanguage = "en-US";
             LongRunningOperationRetryTimeout = 30;
             GenerateClientRequestId = true;
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperations.cs
index 391530e8e1671..69e92624c14a9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperations.cs
@@ -51,13 +51,14 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all billing permissions the caller has for a customer.
+        /// Lists the billing permissions the caller has for a customer.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -80,7 +81,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingPermissionsListResult>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -204,7 +205,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingPermissionsListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingPermissionsProperties>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -217,7 +218,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingPermissionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingPermissionsProperties>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -237,10 +238,11 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all billing permissions for the caller under a billing account.
+        /// Lists the billing permissions the caller has on a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -263,7 +265,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingPermissionsListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -381,7 +383,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingPermissionsListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingPermissionsProperties>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -394,7 +396,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingPermissionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingPermissionsProperties>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -414,16 +416,17 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all billing permissions for the caller under invoice section.
+        /// Lists the billing permissions the caller has on an invoice section.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -446,7 +449,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingPermissionsListResult>> ListByInvoiceSectionsWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByInvoiceSectionsWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -576,7 +579,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingPermissionsListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingPermissionsProperties>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -589,7 +592,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingPermissionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingPermissionsProperties>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -609,13 +612,14 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all billing permissions the caller has for a billing account.
+        /// Lists the billing permissions the caller has on a billing profile.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -638,7 +642,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingPermissionsListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -762,7 +766,7 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingPermissionsListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingPermissionsProperties>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -775,7 +779,683 @@ internal BillingPermissionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingPermissionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingPermissionsProperties>>(_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>
+        /// Lists the billing permissions the caller has for a customer.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByCustomerNextWithHttpMessagesAsync(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, "ListByCustomerNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingPermissionsProperties>>();
+            _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<BillingPermissionsProperties>>(_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>
+        /// Lists the billing permissions the caller has on a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingPermissionsProperties>>();
+            _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<BillingPermissionsProperties>>(_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>
+        /// Lists the billing permissions the caller has on an invoice section.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByInvoiceSectionsNextWithHttpMessagesAsync(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, "ListByInvoiceSectionsNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingPermissionsProperties>>();
+            _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<BillingPermissionsProperties>>(_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>
+        /// Lists the billing permissions the caller has on a billing profile.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingPermissionsProperties>>();
+            _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<BillingPermissionsProperties>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperationsExtensions.cs
index 1367a626c59df..11e6740a51930 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPermissionsOperationsExtensions.cs
@@ -22,38 +22,40 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingPermissionsOperationsExtensions
     {
             /// <summary>
-            /// Lists all billing permissions the caller has for a customer.
+            /// Lists the billing permissions the caller has for a customer.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
-            public static BillingPermissionsListResult ListByCustomer(this IBillingPermissionsOperations operations, string billingAccountName, string customerName)
+            public static IPage<BillingPermissionsProperties> ListByCustomer(this IBillingPermissionsOperations operations, string billingAccountName, string customerName)
             {
                 return operations.ListByCustomerAsync(billingAccountName, customerName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing permissions the caller has for a customer.
+            /// Lists the billing permissions the caller has for a customer.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingPermissionsListResult> ListByCustomerAsync(this IBillingPermissionsOperations operations, string billingAccountName, string customerName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingPermissionsProperties>> ListByCustomerAsync(this IBillingPermissionsOperations operations, string billingAccountName, string customerName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByCustomerWithHttpMessagesAsync(billingAccountName, customerName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -62,32 +64,34 @@ public static BillingPermissionsListResult ListByCustomer(this IBillingPermissio
             }
 
             /// <summary>
-            /// Lists all billing permissions for the caller under a billing account.
+            /// Lists the billing permissions the caller has on a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            public static BillingPermissionsListResult ListByBillingAccount(this IBillingPermissionsOperations operations, string billingAccountName)
+            public static IPage<BillingPermissionsProperties> ListByBillingAccount(this IBillingPermissionsOperations operations, string billingAccountName)
             {
                 return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing permissions for the caller under a billing account.
+            /// Lists the billing permissions the caller has on a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingPermissionsListResult> ListByBillingAccountAsync(this IBillingPermissionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingPermissionsProperties>> ListByBillingAccountAsync(this IBillingPermissionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -96,44 +100,46 @@ public static BillingPermissionsListResult ListByBillingAccount(this IBillingPer
             }
 
             /// <summary>
-            /// Lists all billing permissions for the caller under invoice section.
+            /// Lists the billing permissions the caller has on an invoice section.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
-            public static BillingPermissionsListResult ListByInvoiceSections(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
+            public static IPage<BillingPermissionsProperties> ListByInvoiceSections(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
             {
                 return operations.ListByInvoiceSectionsAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing permissions for the caller under invoice section.
+            /// Lists the billing permissions the caller has on an invoice section.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingPermissionsListResult> ListByInvoiceSectionsAsync(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingPermissionsProperties>> ListByInvoiceSectionsAsync(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByInvoiceSectionsWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -142,38 +148,40 @@ public static BillingPermissionsListResult ListByInvoiceSections(this IBillingPe
             }
 
             /// <summary>
-            /// Lists all billing permissions the caller has for a billing account.
+            /// Lists the billing permissions the caller has on a billing profile.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            public static BillingPermissionsListResult ListByBillingProfile(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName)
+            public static IPage<BillingPermissionsProperties> ListByBillingProfile(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName)
             {
                 return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing permissions the caller has for a billing account.
+            /// Lists the billing permissions the caller has on a billing profile.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingPermissionsListResult> ListByBillingProfileAsync(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingPermissionsProperties>> ListByBillingProfileAsync(this IBillingPermissionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -181,5 +189,149 @@ public static BillingPermissionsListResult ListByBillingProfile(this IBillingPer
                 }
             }
 
+            /// <summary>
+            /// Lists the billing permissions the caller has for a customer.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties> ListByCustomerNext(this IBillingPermissionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByCustomerNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has for a customer.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties>> ListByCustomerNextAsync(this IBillingPermissionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByCustomerNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties> ListByBillingAccountNext(this IBillingPermissionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on a billing account.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties>> ListByBillingAccountNextAsync(this IBillingPermissionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on an invoice section.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties> ListByInvoiceSectionsNext(this IBillingPermissionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByInvoiceSectionsNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on an invoice section.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties>> ListByInvoiceSectionsNextAsync(this IBillingPermissionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByInvoiceSectionsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on a billing profile.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties> ListByBillingProfileNext(this IBillingPermissionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing permissions the caller has on a billing profile.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingPermissionsProperties>> ListByBillingProfileNextAsync(this IBillingPermissionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperations.cs
index 351954a12e559..f0b4b805d750e 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperations.cs
@@ -51,13 +51,16 @@ internal BillingProfilesOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all billing profiles for a user which that user has access to.
+        /// Lists the billing profiles that a user has access to. The operation is
+        /// supported for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the invoiceSections.
+        /// May be used to expand the invoice sections.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -80,7 +83,7 @@ internal BillingProfilesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingProfileListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingProfile>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -203,7 +206,7 @@ internal BillingProfilesOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingProfileListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingProfile>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -216,7 +219,7 @@ internal BillingProfilesOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingProfileListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingProfile>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -236,16 +239,19 @@ internal BillingProfilesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the billing profile by id.
+        /// Gets a billing profile by its ID. The operation is supported for billing
+        /// accounts with agreement type Microsoft Customer Agreement or Microsoft
+        /// Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the invoiceSections.
+        /// May be used to expand the invoice sections.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -429,5 +435,422 @@ internal BillingProfilesOperations(BillingManagementClient client)
             return _result;
         }
 
+        /// <summary>
+        /// Creates or updates a billing profile. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement or
+        /// Microsoft Partner Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated billing profile.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<BillingProfile,BillingProfilesCreateOrUpdateHeaders>> CreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingProfile parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<BillingProfile,BillingProfilesCreateOrUpdateHeaders> _response = await BeginCreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Creates or updates a billing profile. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement or
+        /// Microsoft Partner Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated billing profile.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingProfile,BillingProfilesCreateOrUpdateHeaders>> BeginCreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingProfile parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (billingAccountName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
+            }
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
+            if (parameters != null)
+            {
+                parameters.Validate();
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("parameters", parameters);
+                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("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}").ToString();
+            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            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("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(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingProfile,BillingProfilesCreateOrUpdateHeaders>();
+            _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<BillingProfile>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            try
+            {
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<BillingProfilesCreateOrUpdateHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+            }
+            catch (JsonException ex)
+            {
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Lists the billing profiles that a user has access to. The operation is
+        /// supported for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingProfile>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingProfile>>();
+            _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<BillingProfile>>(_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;
+        }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperationsExtensions.cs
index 80199a8a87d82..c83e977d70be3 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingProfilesOperationsExtensions.cs
@@ -22,38 +22,44 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingProfilesOperationsExtensions
     {
             /// <summary>
-            /// Lists all billing profiles for a user which that user has access to.
+            /// Lists the billing profiles that a user has access to. The operation is
+            /// supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the invoiceSections.
+            /// May be used to expand the invoice sections.
             /// </param>
-            public static BillingProfileListResult ListByBillingAccount(this IBillingProfilesOperations operations, string billingAccountName, string expand = default(string))
+            public static IPage<BillingProfile> ListByBillingAccount(this IBillingProfilesOperations operations, string billingAccountName, string expand = default(string))
             {
                 return operations.ListByBillingAccountAsync(billingAccountName, expand).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all billing profiles for a user which that user has access to.
+            /// Lists the billing profiles that a user has access to. The operation is
+            /// supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the invoiceSections.
+            /// May be used to expand the invoice sections.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingProfileListResult> ListByBillingAccountAsync(this IBillingProfilesOperations operations, string billingAccountName, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingProfile>> ListByBillingAccountAsync(this IBillingProfilesOperations operations, string billingAccountName, string expand = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, expand, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -62,19 +68,22 @@ public static partial class BillingProfilesOperationsExtensions
             }
 
             /// <summary>
-            /// Get the billing profile by id.
+            /// Gets a billing profile by its ID. The operation is supported for billing
+            /// accounts with agreement type Microsoft Customer Agreement or Microsoft
+            /// Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the invoiceSections.
+            /// May be used to expand the invoice sections.
             /// </param>
             public static BillingProfile Get(this IBillingProfilesOperations operations, string billingAccountName, string billingProfileName, string expand = default(string))
             {
@@ -82,19 +91,22 @@ public static partial class BillingProfilesOperationsExtensions
             }
 
             /// <summary>
-            /// Get the billing profile by id.
+            /// Gets a billing profile by its ID. The operation is supported for billing
+            /// accounts with agreement type Microsoft Customer Agreement or Microsoft
+            /// Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand the invoiceSections.
+            /// May be used to expand the invoice sections.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -107,5 +119,145 @@ public static partial class BillingProfilesOperationsExtensions
                 }
             }
 
+            /// <summary>
+            /// Creates or updates a billing profile. The operation is supported for
+            /// billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated billing profile.
+            /// </param>
+            public static BillingProfile CreateOrUpdate(this IBillingProfilesOperations operations, string billingAccountName, string billingProfileName, BillingProfile parameters)
+            {
+                return operations.CreateOrUpdateAsync(billingAccountName, billingProfileName, parameters).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Creates or updates a billing profile. The operation is supported for
+            /// billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated billing profile.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<BillingProfile> CreateOrUpdateAsync(this IBillingProfilesOperations operations, string billingAccountName, string billingProfileName, BillingProfile parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Creates or updates a billing profile. The operation is supported for
+            /// billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated billing profile.
+            /// </param>
+            public static BillingProfile BeginCreateOrUpdate(this IBillingProfilesOperations operations, string billingAccountName, string billingProfileName, BillingProfile parameters)
+            {
+                return operations.BeginCreateOrUpdateAsync(billingAccountName, billingProfileName, parameters).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Creates or updates a billing profile. The operation is supported for
+            /// billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated billing profile.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<BillingProfile> BeginCreateOrUpdateAsync(this IBillingProfilesOperations operations, string billingAccountName, string billingProfileName, BillingProfile parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginCreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the billing profiles that a user has access to. The operation is
+            /// supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingProfile> ListByBillingAccountNext(this IBillingProfilesOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the billing profiles that a user has access to. The operation is
+            /// supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingProfile>> ListByBillingAccountNextAsync(this IBillingProfilesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperations.cs
index 32e94e50b9d55..758c4211b72db 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperations.cs
@@ -51,7 +51,8 @@ internal BillingPropertyOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get billing property by subscription Id.
+        /// Get the billing properties for a subscription. This operation is not
+        /// supported for billing accounts with agreement type Enterprise Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='customHeaders'>
@@ -224,5 +225,195 @@ internal BillingPropertyOperations(BillingManagementClient client)
             return _result;
         }
 
+        /// <summary>
+        /// Updates the billing property of a subscription. Currently, cost center can
+        /// be updated. The operation is supported only for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
+        /// </summary>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing property
+        /// operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingProperty>> UpdateWithHttpMessagesAsync(BillingProperty parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("parameters", parameters);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Billing/billingProperty/default").ToString();
+            _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("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(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingProperty>();
+            _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<BillingProperty>(_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;
+        }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperationsExtensions.cs
index 99b7476e92a25..06b69fe009fe4 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingPropertyOperationsExtensions.cs
@@ -22,7 +22,8 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingPropertyOperationsExtensions
     {
             /// <summary>
-            /// Get billing property by subscription Id.
+            /// Get the billing properties for a subscription. This operation is not
+            /// supported for billing accounts with agreement type Enterprise Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -34,7 +35,8 @@ public static BillingProperty Get(this IBillingPropertyOperations operations)
             }
 
             /// <summary>
-            /// Get billing property by subscription Id.
+            /// Get the billing properties for a subscription. This operation is not
+            /// supported for billing accounts with agreement type Enterprise Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -51,5 +53,45 @@ public static BillingProperty Get(this IBillingPropertyOperations operations)
                 }
             }
 
+            /// <summary>
+            /// Updates the billing property of a subscription. Currently, cost center can
+            /// be updated. The operation is supported only for billing accounts with
+            /// agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing property
+            /// operation.
+            /// </param>
+            public static BillingProperty Update(this IBillingPropertyOperations operations, BillingProperty parameters)
+            {
+                return operations.UpdateAsync(parameters).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Updates the billing property of a subscription. Currently, cost center can
+            /// be updated. The operation is supported only for billing accounts with
+            /// agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing property
+            /// operation.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<BillingProperty> UpdateAsync(this IBillingPropertyOperations operations, BillingProperty parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.UpdateWithHttpMessagesAsync(parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperations.cs
index 5375183fd3b56..96b79c9460a99 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperations.cs
@@ -51,13 +51,16 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Get the role assignment for the caller
+        /// Gets a role assignment for the caller on a billing account. The operation
+        /// is supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -237,13 +240,15 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Delete the role assignment on this billing account
+        /// Deletes a role assignment for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -423,19 +428,22 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the role assignment for the caller on the invoice Section
+        /// Gets a role assignment for the caller on an invoice section. The operation
+        /// is supported for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -627,19 +635,21 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Delete the role assignment on the invoice Section
+        /// Deletes a role assignment for the caller on an invoice section. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -831,16 +841,19 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the role assignment for the caller on the Billing Profile
+        /// Gets a role assignment for the caller on a billing profile. The operation
+        /// is supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1026,16 +1039,18 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Delete the role assignment on this Billing Profile
+        /// Deletes a role assignment for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1221,10 +1236,13 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the role assignments on the Billing Account
+        /// Lists the role assignments for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1247,7 +1265,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1365,7 +1383,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1378,7 +1396,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1398,13 +1416,19 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to add a role assignment to a billing account.
+        /// Lists the role assignments for the caller on an invoice section. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1427,7 +1451,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByBillingAccountWithHttpMessagesAsync(string billingAccountName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1437,9 +1461,13 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (parameters == null)
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
+            if (invoiceSectionName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -1449,14 +1477,17 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("parameters", parameters);
+                tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "AddByBillingAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/createBillingRoleAssignment").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingRoleAssignments").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1469,7 +1500,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient 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)
@@ -1500,12 +1531,6 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(parameters != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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)
             {
@@ -1526,7 +1551,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 201)
+            if ((int)_statusCode != 200)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1556,7 +1581,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1564,12 +1589,12 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 201)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1589,16 +1614,16 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the role assignments on the invoice Section
+        /// Lists the role assignments for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1621,7 +1646,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1635,10 +1660,6 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
             }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1648,16 +1669,14 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingRoleAssignments").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingRoleAssignments").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
             _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1751,7 +1770,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1764,7 +1783,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1784,19 +1803,13 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to add a role assignment to a invoice Section.
+        /// Lists the role assignments for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1819,27 +1832,11 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (Client.ApiVersion == null)
+            if (nextPageLink == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
-            if (parameters == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -1848,24 +1845,14 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
-                tracingParameters.Add("parameters", parameters);
+                tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "AddByInvoiceSection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccountNext", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/createBillingRoleAssignment").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
+            string _url = "{nextLink}";
+            _url = _url.Replace("{nextLink}", nextPageLink);
             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);
@@ -1873,7 +1860,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient 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)
@@ -1904,12 +1891,6 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(parameters != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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)
             {
@@ -1930,7 +1911,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 201)
+            if ((int)_statusCode != 200)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1960,7 +1941,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1968,12 +1949,12 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 201)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1993,13 +1974,13 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the role assignments on the Billing Profile
+        /// Lists the role assignments for the caller on an invoice section. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2022,19 +2003,11 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByInvoiceSectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (Client.ApiVersion == null)
+            if (nextPageLink == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -2043,21 +2016,14 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSectionNext", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingRoleAssignments").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            string _url = "{nextLink}";
+            _url = _url.Replace("{nextLink}", nextPageLink);
             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);
@@ -2146,7 +2112,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2159,7 +2125,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -2179,16 +2145,13 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to add a role assignment to a billing profile.
+        /// Lists the role assignments for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <param name='nextPageLink'>
+        /// The NextLink from the previous successful call to List operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -2211,23 +2174,11 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
+            if (nextPageLink == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (parameters == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -2236,22 +2187,14 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("parameters", parameters);
+                tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "AddByBillingProfile", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfileNext", tracingParameters);
             }
             // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/createBillingRoleAssignment").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            string _url = "{nextLink}";
+            _url = _url.Replace("{nextLink}", nextPageLink);
             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);
@@ -2259,7 +2202,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient 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)
@@ -2290,12 +2233,6 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(parameters != null)
-            {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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)
             {
@@ -2316,7 +2253,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 201)
+            if ((int)_statusCode != 200)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -2346,7 +2283,7 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleAssignmentListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleAssignment>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -2354,12 +2291,12 @@ internal BillingRoleAssignmentsOperations(BillingManagementClient client)
                 _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
             }
             // Deserialize Response
-            if ((int)_statusCode == 201)
+            if ((int)_statusCode == 200)
             {
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleAssignmentListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleAssignment>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperationsExtensions.cs
index cb60a1654a818..48c8e80f62799 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleAssignmentsOperationsExtensions.cs
@@ -22,16 +22,19 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingRoleAssignmentsOperationsExtensions
     {
             /// <summary>
-            /// Get the role assignment for the caller
+            /// Gets a role assignment for the caller on a billing account. The operation
+            /// is supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment GetByBillingAccount(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingRoleAssignmentName)
             {
@@ -39,16 +42,19 @@ public static BillingRoleAssignment GetByBillingAccount(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Get the role assignment for the caller
+            /// Gets a role assignment for the caller on a billing account. The operation
+            /// is supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -62,16 +68,18 @@ public static BillingRoleAssignment GetByBillingAccount(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Delete the role assignment on this billing account
+            /// Deletes a role assignment for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment DeleteByBillingAccount(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingRoleAssignmentName)
             {
@@ -79,16 +87,18 @@ public static BillingRoleAssignment DeleteByBillingAccount(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Delete the role assignment on this billing account
+            /// Deletes a role assignment for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -102,22 +112,25 @@ public static BillingRoleAssignment DeleteByBillingAccount(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Get the role assignment for the caller on the invoice Section
+            /// Gets a role assignment for the caller on an invoice section. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment GetByInvoiceSection(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleAssignmentName)
             {
@@ -125,22 +138,25 @@ public static BillingRoleAssignment GetByInvoiceSection(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Get the role assignment for the caller on the invoice Section
+            /// Gets a role assignment for the caller on an invoice section. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -154,22 +170,24 @@ public static BillingRoleAssignment GetByInvoiceSection(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Delete the role assignment on the invoice Section
+            /// Deletes a role assignment for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment DeleteByInvoiceSection(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleAssignmentName)
             {
@@ -177,22 +195,24 @@ public static BillingRoleAssignment DeleteByInvoiceSection(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Delete the role assignment on the invoice Section
+            /// Deletes a role assignment for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -206,19 +226,22 @@ public static BillingRoleAssignment DeleteByInvoiceSection(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Get the role assignment for the caller on the Billing Profile
+            /// Gets a role assignment for the caller on a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment GetByBillingProfile(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string billingRoleAssignmentName)
             {
@@ -226,19 +249,22 @@ public static BillingRoleAssignment GetByBillingProfile(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Get the role assignment for the caller on the Billing Profile
+            /// Gets a role assignment for the caller on a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -252,19 +278,21 @@ public static BillingRoleAssignment GetByBillingProfile(this IBillingRoleAssignm
             }
 
             /// <summary>
-            /// Delete the role assignment on this Billing Profile
+            /// Deletes a role assignment for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             public static BillingRoleAssignment DeleteByBillingProfile(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string billingRoleAssignmentName)
             {
@@ -272,19 +300,21 @@ public static BillingRoleAssignment DeleteByBillingProfile(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Delete the role assignment on this Billing Profile
+            /// Deletes a role assignment for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleAssignmentName'>
-            /// role assignment id.
+            /// The ID that uniquely identifies a role assignment.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -298,32 +328,38 @@ public static BillingRoleAssignment DeleteByBillingProfile(this IBillingRoleAssi
             }
 
             /// <summary>
-            /// Get the role assignments on the Billing Account
+            /// Lists the role assignments for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            public static BillingRoleAssignmentListResult ListByBillingAccount(this IBillingRoleAssignmentsOperations operations, string billingAccountName)
+            public static IPage<BillingRoleAssignment> ListByBillingAccount(this IBillingRoleAssignmentsOperations operations, string billingAccountName)
             {
                 return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get the role assignments on the Billing Account
+            /// Lists the role assignments for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleAssignmentListResult> ListByBillingAccountAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByBillingAccountAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -332,224 +368,218 @@ public static BillingRoleAssignmentListResult ListByBillingAccount(this IBilling
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a billing account.
+            /// Lists the role assignments for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
-            public static BillingRoleAssignmentListResult AddByBillingAccount(this IBillingRoleAssignmentsOperations operations, string billingAccountName, BillingRoleAssignmentPayload parameters)
+            public static IPage<BillingRoleAssignment> ListByInvoiceSection(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
             {
-                return operations.AddByBillingAccountAsync(billingAccountName, parameters).GetAwaiter().GetResult();
+                return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a billing account.
+            /// Lists the role assignments for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleAssignmentListResult> AddByBillingAccountAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, BillingRoleAssignmentPayload parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByInvoiceSectionAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.AddByBillingAccountWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get the role assignments on the invoice Section
+            /// Lists the role assignments for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            public static BillingRoleAssignmentListResult ListByInvoiceSection(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
+            public static IPage<BillingRoleAssignment> ListByBillingProfile(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName)
             {
-                return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
+                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get the role assignments on the invoice Section
+            /// Lists the role assignments for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleAssignmentListResult> ListByInvoiceSectionAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByBillingProfileAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a invoice Section.
+            /// Lists the role assignments for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static BillingRoleAssignmentListResult AddByInvoiceSection(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, BillingRoleAssignmentPayload parameters)
+            public static IPage<BillingRoleAssignment> ListByBillingAccountNext(this IBillingRoleAssignmentsOperations operations, string nextPageLink)
             {
-                return operations.AddByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters).GetAwaiter().GetResult();
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a invoice Section.
+            /// Lists the role assignments for the caller on a billing account. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
+            /// <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<BillingRoleAssignmentListResult> AddByInvoiceSectionAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, BillingRoleAssignmentPayload parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByBillingAccountNextAsync(this IBillingRoleAssignmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.AddByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get the role assignments on the Billing Profile
+            /// Lists the role assignments for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static BillingRoleAssignmentListResult ListByBillingProfile(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName)
+            public static IPage<BillingRoleAssignment> ListByInvoiceSectionNext(this IBillingRoleAssignmentsOperations operations, string nextPageLink)
             {
-                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
+                return operations.ListByInvoiceSectionNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get the role assignments on the Billing Profile
+            /// Lists the role assignments for the caller on an invoice section. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// <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<BillingRoleAssignmentListResult> ListByBillingProfileAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByInvoiceSectionNextAsync(this IBillingRoleAssignmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByInvoiceSectionNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a billing profile.
+            /// Lists the role assignments for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
             /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
-            /// </param>
-            public static BillingRoleAssignmentListResult AddByBillingProfile(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, BillingRoleAssignmentPayload parameters)
+            public static IPage<BillingRoleAssignment> ListByBillingProfileNext(this IBillingRoleAssignmentsOperations operations, string nextPageLink)
             {
-                return operations.AddByBillingProfileAsync(billingAccountName, billingProfileName, parameters).GetAwaiter().GetResult();
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// The operation to add a role assignment to a billing profile.
+            /// Lists the role assignments for the caller on a billing profile. The
+            /// operation is supported for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='parameters'>
-            /// Parameters supplied to add a role assignment.
+            /// <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<BillingRoleAssignmentListResult> AddByBillingProfileAsync(this IBillingRoleAssignmentsOperations operations, string billingAccountName, string billingProfileName, BillingRoleAssignmentPayload parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleAssignment>> ListByBillingProfileNextAsync(this IBillingRoleAssignmentsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.AddByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperations.cs
index db1c6fc46e7f4..bf753c9e6b5cc 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperations.cs
@@ -51,13 +51,16 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -237,19 +240,22 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on an invoice section. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -441,16 +447,19 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on a billing profile. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -636,10 +645,13 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the role definition for a billing account
+        /// Lists the role definitions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -662,7 +674,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -780,7 +792,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleDefinitionListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -793,7 +805,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleDefinitionListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -813,16 +825,19 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the role definition for an invoice Section
+        /// Lists the role definitions for an invoice section. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -845,7 +860,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -975,7 +990,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleDefinitionListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -988,7 +1003,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleDefinitionListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1008,13 +1023,16 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the role definition for a Billing Profile
+        /// Lists the role definitions for a billing profile. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1037,7 +1055,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -1161,7 +1179,7 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingRoleDefinitionListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingRoleDefinition>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1174,7 +1192,520 @@ internal BillingRoleDefinitionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingRoleDefinitionListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingRoleDefinition>>(_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>
+        /// Lists the role definitions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingRoleDefinition>>();
+            _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<BillingRoleDefinition>>(_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>
+        /// Lists the role definitions for an invoice section. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByInvoiceSectionNextWithHttpMessagesAsync(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, "ListByInvoiceSectionNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingRoleDefinition>>();
+            _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<BillingRoleDefinition>>(_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>
+        /// Lists the role definitions for a billing profile. The operation is
+        /// supported for billing accounts with agreement type Microsoft Partner
+        /// Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingRoleDefinition>>();
+            _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<BillingRoleDefinition>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperationsExtensions.cs
index 10e68be3ec676..4191352dd36f9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingRoleDefinitionsOperationsExtensions.cs
@@ -22,16 +22,19 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingRoleDefinitionsOperationsExtensions
     {
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             public static BillingRoleDefinition GetByBillingAccount(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingRoleDefinitionName)
             {
@@ -39,16 +42,19 @@ public static BillingRoleDefinition GetByBillingAccount(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -62,22 +68,25 @@ public static BillingRoleDefinition GetByBillingAccount(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on an invoice section. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             public static BillingRoleDefinition GetByInvoiceSection(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleDefinitionName)
             {
@@ -85,22 +94,25 @@ public static BillingRoleDefinition GetByInvoiceSection(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on an invoice section. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -114,19 +126,22 @@ public static BillingRoleDefinition GetByInvoiceSection(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             public static BillingRoleDefinition GetByBillingProfile(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string billingRoleDefinitionName)
             {
@@ -134,19 +149,22 @@ public static BillingRoleDefinition GetByBillingProfile(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Gets the role definition for a role
+            /// Gets the definition for a role on a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='billingRoleDefinitionName'>
-            /// role definition id.
+            /// The ID that uniquely identifies a role definition.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -160,32 +178,38 @@ public static BillingRoleDefinition GetByBillingProfile(this IBillingRoleDefinit
             }
 
             /// <summary>
-            /// Lists the role definition for a billing account
+            /// Lists the role definitions for a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            public static BillingRoleDefinitionListResult ListByBillingAccount(this IBillingRoleDefinitionsOperations operations, string billingAccountName)
+            public static IPage<BillingRoleDefinition> ListByBillingAccount(this IBillingRoleDefinitionsOperations operations, string billingAccountName)
             {
                 return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists the role definition for a billing account
+            /// Lists the role definitions for a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleDefinitionListResult> ListByBillingAccountAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleDefinition>> ListByBillingAccountAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -194,44 +218,50 @@ public static BillingRoleDefinitionListResult ListByBillingAccount(this IBilling
             }
 
             /// <summary>
-            /// Lists the role definition for an invoice Section
+            /// Lists the role definitions for an invoice section. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
-            public static BillingRoleDefinitionListResult ListByInvoiceSection(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
+            public static IPage<BillingRoleDefinition> ListByInvoiceSection(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
             {
                 return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists the role definition for an invoice Section
+            /// Lists the role definitions for an invoice section. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleDefinitionListResult> ListByInvoiceSectionAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleDefinition>> ListByInvoiceSectionAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -240,38 +270,44 @@ public static BillingRoleDefinitionListResult ListByInvoiceSection(this IBilling
             }
 
             /// <summary>
-            /// Lists the role definition for a Billing Profile
+            /// Lists the role definitions for a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            public static BillingRoleDefinitionListResult ListByBillingProfile(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName)
+            public static IPage<BillingRoleDefinition> ListByBillingProfile(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName)
             {
                 return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists the role definition for a Billing Profile
+            /// Lists the role definitions for a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingRoleDefinitionListResult> ListByBillingProfileAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingRoleDefinition>> ListByBillingProfileAsync(this IBillingRoleDefinitionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -279,5 +315,125 @@ public static BillingRoleDefinitionListResult ListByBillingProfile(this IBilling
                 }
             }
 
+            /// <summary>
+            /// Lists the role definitions for a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition> ListByBillingAccountNext(this IBillingRoleDefinitionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the role definitions for a billing account. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition>> ListByBillingAccountNextAsync(this IBillingRoleDefinitionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the role definitions for an invoice section. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition> ListByInvoiceSectionNext(this IBillingRoleDefinitionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByInvoiceSectionNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the role definitions for an invoice section. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition>> ListByInvoiceSectionNextAsync(this IBillingRoleDefinitionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByInvoiceSectionNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the role definitions for a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition> ListByBillingProfileNext(this IBillingRoleDefinitionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the role definitions for a billing profile. The operation is
+            /// supported for billing accounts with agreement type Microsoft Partner
+            /// Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingRoleDefinition>> ListByBillingProfileNextAsync(this IBillingRoleDefinitionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperations.cs
index fa77fa944c0a0..54c96a32e0932 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperations.cs
@@ -51,14 +51,15 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists billing subscription by customer id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a customer. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -238,17 +239,13 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get a single billing subscription by id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a billing account. The operation is supported
+        /// for billing accounts with agreement type Microsoft Customer Agreement or
+        /// Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -271,20 +268,12 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingSubscription>> GetByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string billingSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (customerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "customerName");
-            }
-            if (billingSubscriptionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -297,17 +286,13 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("customerName", customerName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetByCustomer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/billingSubscriptions/{billingSubscriptionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{customerName}", System.Uri.EscapeDataString(customerName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -401,7 +386,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingSubscription>();
+            var _result = new AzureOperationResponse<IPage<BillingSubscription>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -414,7 +399,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingSubscription>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingSubscription>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -434,11 +419,16 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists billing subscriptions by billing account name.
+        /// Lists the subscriptions that are billed to a billing profile. The operation
+        /// is supported for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -461,12 +451,16 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -479,13 +473,15 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingSubscriptions").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -612,14 +608,19 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists billing subscriptions by billing profile name.
+        /// Lists the subscriptions that are billed to an invoice section. The
+        /// operation is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -642,7 +643,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingSubscriptionsListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
@@ -652,6 +653,10 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
             }
+            if (invoiceSectionName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -665,14 +670,16 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSection", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/billingSubscriptions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingSubscriptions").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
             _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -766,7 +773,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingSubscriptionsListResult>();
+            var _result = new AzureOperationResponse<IPage<BillingSubscription>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -779,7 +786,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingSubscriptionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<BillingSubscription>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -799,17 +806,13 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists billing subscription by invoice section name.
+        /// Gets a subscription by its ID. The operation is supported for billing
+        /// accounts with agreement type Microsoft Customer Agreement and Microsoft
+        /// Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -832,19 +835,15 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingSubscriptionsListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<BillingSubscription>> GetWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
             if (Client.ApiVersion == null)
             {
@@ -858,17 +857,14 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingSubscriptions").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -962,7 +958,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<BillingSubscriptionsListResult>();
+            var _result = new AzureOperationResponse<BillingSubscription>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -975,7 +971,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingSubscriptionsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingSubscription>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -995,20 +991,16 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get a single billing subscription by name.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// Updates the properties of a billing subscription. Currently, cost center
+        /// can be updated. The operation is supported only for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing subscription
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1031,28 +1023,24 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<BillingSubscription>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<BillingSubscription>> UpdateWithHttpMessagesAsync(string billingAccountName, BillingSubscription parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
-            if (billingSubscriptionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1061,19 +1049,15 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -1086,7 +1070,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient 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)
@@ -1117,6 +1101,12 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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)
             {
@@ -1200,23 +1190,17 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Transfers the subscription from one invoice section to another within a
-        /// billing account.
+        /// Moves a subscription's charges to a new invoice section. The new invoice
+        /// section must belong to the same billing profile as the existing invoice
+        /// section. This operation is supported for billing accounts with agreement
+        /// type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Request parameters supplied to the Transfer Billing Subscription operation.
+        /// Request parameters that are provided to the move subscription operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -1224,30 +1208,25 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <param name='cancellationToken'>
         /// The cancellation token.
         /// </param>
-        public async Task<AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders>> TransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders>> MoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             // Send request
-            AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders> _response = await BeginTransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
+            AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders> _response = await BeginMoveWithHttpMessagesAsync(billingAccountName, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
             return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Validates the transfer of billing subscriptions across invoice sections.
+        /// Validates if a subscription's charges can be moved to a new invoice
+        /// section. This operation is supported for billing accounts with agreement
+        /// type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Billing Subscription operation.
+        /// Request parameters that are provided to the validate move eligibility
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1270,28 +1249,28 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ValidateSubscriptionTransferEligibilityResult>> ValidateTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ValidateSubscriptionTransferEligibilityResult>> ValidateMoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            if (billingSubscriptionName == null)
+            if (Client.ApiVersion == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
             if (parameters == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
             }
+            if (parameters != null)
+            {
+                parameters.Validate();
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1300,21 +1279,20 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
                 tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ValidateTransfer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ValidateMove", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/validateTransferEligibility").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}/validateMoveEligibility").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
+            _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);
@@ -1442,23 +1420,17 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Transfers the subscription from one invoice section to another within a
-        /// billing account.
+        /// Moves a subscription's charges to a new invoice section. The new invoice
+        /// section must belong to the same billing profile as the existing invoice
+        /// section. This operation is supported for billing accounts with agreement
+        /// type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Request parameters supplied to the Transfer Billing Subscription operation.
+        /// Request parameters that are provided to the move subscription operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1481,28 +1453,28 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders>> BeginTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders>> BeginMoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
-            if (billingSubscriptionName == null)
+            if (Client.ApiVersion == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
             if (parameters == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
             }
+            if (parameters != null)
+            {
+                parameters.Validate();
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -1511,21 +1483,20 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
                 tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginTransfer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginMove", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/billingSubscriptions/{billingSubscriptionName}/transfer").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{subscriptionId}/move").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
+            _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);
@@ -1620,7 +1591,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders>();
+            var _result = new AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1633,7 +1604,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<TransferBillingSubscriptionResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<BillingSubscription>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1647,7 +1618,7 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
             }
             try
             {
-                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<BillingSubscriptionsTransferHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<BillingSubscriptionsMoveHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
             }
             catch (JsonException ex)
             {
@@ -1666,8 +1637,9 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists billing subscription by customer id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a customer. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -1835,7 +1807,9 @@ internal BillingSubscriptionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists billing subscriptions by billing account name.
+        /// Lists the subscriptions for a billing account. The operation is supported
+        /// for billing accounts with agreement type Microsoft Customer Agreement or
+        /// Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -1907,6 +1881,348 @@ internal BillingSubscriptionsOperations(BillingManagementClient 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingSubscription>>();
+            _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<BillingSubscription>>(_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>
+        /// Lists the subscriptions that are billed to a billing profile. The operation
+        /// is supported for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingSubscription>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<BillingSubscription>>();
+            _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<BillingSubscription>>(_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>
+        /// Lists the subscriptions that are billed to an invoice section. The
+        /// operation is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingSubscription>>> ListByInvoiceSectionNextWithHttpMessagesAsync(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, "ListByInvoiceSectionNext", 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/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperationsExtensions.cs
index e4cc2f127fb06..c62b4473f4944 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/BillingSubscriptionsOperationsExtensions.cs
@@ -22,17 +22,18 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class BillingSubscriptionsOperationsExtensions
     {
             /// <summary>
-            /// Lists billing subscription by customer id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a customer. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             public static IPage<BillingSubscription> ListByCustomer(this IBillingSubscriptionsOperations operations, string billingAccountName, string customerName)
             {
@@ -40,17 +41,18 @@ public static IPage<BillingSubscription> ListByCustomer(this IBillingSubscriptio
             }
 
             /// <summary>
-            /// Lists billing subscription by customer id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a customer. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -64,414 +66,377 @@ public static IPage<BillingSubscription> ListByCustomer(this IBillingSubscriptio
             }
 
             /// <summary>
-            /// Get a single billing subscription by id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a billing account. The operation is supported
+            /// for billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
-            /// </param>
-            public static BillingSubscription GetByCustomer(this IBillingSubscriptionsOperations operations, string billingAccountName, string customerName, string billingSubscriptionName)
+            public static IPage<BillingSubscription> ListByBillingAccount(this IBillingSubscriptionsOperations operations, string billingAccountName)
             {
-                return operations.GetByCustomerAsync(billingAccountName, customerName, billingSubscriptionName).GetAwaiter().GetResult();
+                return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get a single billing subscription by id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a billing account. The operation is supported
+            /// for billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingSubscription> GetByCustomerAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string customerName, string billingSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingSubscription>> ListByBillingAccountAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetByCustomerWithHttpMessagesAsync(billingAccountName, customerName, billingSubscriptionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing account name.
+            /// Lists the subscriptions that are billed to a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            public static IPage<BillingSubscription> ListByBillingAccount(this IBillingSubscriptionsOperations operations, string billingAccountName)
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            public static IPage<BillingSubscription> ListByBillingProfile(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName)
             {
-                return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
+                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing account name.
+            /// Lists the subscriptions that are billed to a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<BillingSubscription>> ListByBillingAccountAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingSubscription>> ListByBillingProfileAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing profile name.
+            /// Lists the subscriptions that are billed to an invoice section. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            public static BillingSubscriptionsListResult ListByBillingProfile(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName)
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
+            /// </param>
+            public static IPage<BillingSubscription> ListByInvoiceSection(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
             {
-                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
+                return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing profile name.
+            /// Lists the subscriptions that are billed to an invoice section. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingSubscriptionsListResult> ListByBillingProfileAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<BillingSubscription>> ListByInvoiceSectionAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists billing subscription by invoice section name.
+            /// Gets a subscription by its ID. The operation is supported for billing
+            /// accounts with agreement type Microsoft Customer Agreement and Microsoft
+            /// Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            public static BillingSubscriptionsListResult ListByInvoiceSection(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
+            public static BillingSubscription Get(this IBillingSubscriptionsOperations operations, string billingAccountName)
             {
-                return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
+                return operations.GetAsync(billingAccountName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists billing subscription by invoice section name.
+            /// Gets a subscription by its ID. The operation is supported for billing
+            /// accounts with agreement type Microsoft Customer Agreement and Microsoft
+            /// Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingSubscriptionsListResult> ListByInvoiceSectionAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<BillingSubscription> GetAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get a single billing subscription by name.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// Updates the properties of a billing subscription. Currently, cost center
+            /// can be updated. The operation is supported only for billing accounts with
+            /// agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing subscription
+            /// operation.
             /// </param>
-            public static BillingSubscription Get(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName)
+            public static BillingSubscription Update(this IBillingSubscriptionsOperations operations, string billingAccountName, BillingSubscription parameters)
             {
-                return operations.GetAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName).GetAwaiter().GetResult();
+                return operations.UpdateAsync(billingAccountName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get a single billing subscription by name.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// Updates the properties of a billing subscription. Currently, cost center
+            /// can be updated. The operation is supported only for billing accounts with
+            /// agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the update billing subscription
+            /// operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<BillingSubscription> GetAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<BillingSubscription> UpdateAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, BillingSubscription parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.UpdateWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Transfers the subscription from one invoice section to another within a
-            /// billing account.
+            /// Moves a subscription's charges to a new invoice section. The new invoice
+            /// section must belong to the same billing profile as the existing invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Request parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the move subscription operation.
             /// </param>
-            public static TransferBillingSubscriptionResult Transfer(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters)
+            public static BillingSubscription Move(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters)
             {
-                return operations.TransferAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters).GetAwaiter().GetResult();
+                return operations.MoveAsync(billingAccountName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Transfers the subscription from one invoice section to another within a
-            /// billing account.
+            /// Moves a subscription's charges to a new invoice section. The new invoice
+            /// section must belong to the same billing profile as the existing invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Request parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the move subscription operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<TransferBillingSubscriptionResult> TransferAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<BillingSubscription> MoveAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.TransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.MoveWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Validates the transfer of billing subscriptions across invoice sections.
+            /// Validates if a subscription's charges can be moved to a new invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the validate move eligibility
+            /// operation.
             /// </param>
-            public static ValidateSubscriptionTransferEligibilityResult ValidateTransfer(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters)
+            public static ValidateSubscriptionTransferEligibilityResult ValidateMove(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters)
             {
-                return operations.ValidateTransferAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters).GetAwaiter().GetResult();
+                return operations.ValidateMoveAsync(billingAccountName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Validates the transfer of billing subscriptions across invoice sections.
+            /// Validates if a subscription's charges can be moved to a new invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the validate move eligibility
+            /// operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ValidateSubscriptionTransferEligibilityResult> ValidateTransferAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<ValidateSubscriptionTransferEligibilityResult> ValidateMoveAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ValidateTransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ValidateMoveWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Transfers the subscription from one invoice section to another within a
-            /// billing account.
+            /// Moves a subscription's charges to a new invoice section. The new invoice
+            /// section must belong to the same billing profile as the existing invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Request parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the move subscription operation.
             /// </param>
-            public static TransferBillingSubscriptionResult BeginTransfer(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters)
+            public static BillingSubscription BeginMove(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters)
             {
-                return operations.BeginTransferAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters).GetAwaiter().GetResult();
+                return operations.BeginMoveAsync(billingAccountName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Transfers the subscription from one invoice section to another within a
-            /// billing account.
+            /// Moves a subscription's charges to a new invoice section. The new invoice
+            /// section must belong to the same billing profile as the existing invoice
+            /// section. This operation is supported for billing accounts with agreement
+            /// type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='parameters'>
-            /// Request parameters supplied to the Transfer Billing Subscription operation.
+            /// Request parameters that are provided to the move subscription operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<TransferBillingSubscriptionResult> BeginTransferAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<BillingSubscription> BeginMoveAsync(this IBillingSubscriptionsOperations operations, string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.BeginTransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, billingSubscriptionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.BeginMoveWithHttpMessagesAsync(billingAccountName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists billing subscription by customer id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a customer. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -485,8 +450,9 @@ public static IPage<BillingSubscription> ListByCustomerNext(this IBillingSubscri
             }
 
             /// <summary>
-            /// Lists billing subscription by customer id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+            /// Lists the subscriptions for a customer. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -506,7 +472,9 @@ public static IPage<BillingSubscription> ListByCustomerNext(this IBillingSubscri
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing account name.
+            /// Lists the subscriptions for a billing account. The operation is supported
+            /// for billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -521,7 +489,9 @@ public static IPage<BillingSubscription> ListByBillingAccountNext(this IBillingS
             }
 
             /// <summary>
-            /// Lists billing subscriptions by billing account name.
+            /// Lists the subscriptions for a billing account. The operation is supported
+            /// for billing accounts with agreement type Microsoft Customer Agreement or
+            /// Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -541,5 +511,85 @@ public static IPage<BillingSubscription> ListByBillingAccountNext(this IBillingS
                 }
             }
 
+            /// <summary>
+            /// Lists the subscriptions that are billed to a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingSubscription> ListByBillingProfileNext(this IBillingSubscriptionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the subscriptions that are billed to a billing profile. The operation
+            /// is supported for billing accounts with agreement type Microsoft Customer
+            /// Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingSubscription>> ListByBillingProfileNextAsync(this IBillingSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the subscriptions that are billed to an invoice section. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingSubscription> ListByInvoiceSectionNext(this IBillingSubscriptionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByInvoiceSectionNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the subscriptions that are billed to an invoice section. The
+            /// operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<BillingSubscription>> ListByInvoiceSectionNextAsync(this IBillingSubscriptionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByInvoiceSectionNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperations.cs
index 828e3e65281b5..5469cab8ec663 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperations.cs
@@ -51,24 +51,24 @@ internal CustomersOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists customers by billing profile which the current user can work with
-        /// on-behalf of a partner.
+        /// Lists the customers that are billed to a billing profile. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='search'>
+        /// Used for searching customers by their name. Any customer with name
+        /// containing the search text will be included in the response
         /// </param>
         /// <param name='filter'>
         /// May be used to filter the list of customers.
         /// </param>
-        /// <param name='skiptoken'>
-        /// Skiptoken is only used if a previous operation returned a partial result.
-        /// If a previous response contains a nextLink element, the value of the
-        /// nextLink element will include a skiptoken parameter that specifies a
-        /// starting point to use for subsequent calls.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -90,7 +90,7 @@ internal CustomersOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Customer>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string filter = default(string), string skiptoken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Customer>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string search = default(string), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -113,8 +113,8 @@ internal CustomersOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("search", search);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("skiptoken", skiptoken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
             }
@@ -128,13 +128,13 @@ internal CustomersOperations(BillingManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (filter != null)
+            if (search != null)
             {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+                _queryParameters.Add(string.Format("$search={0}", System.Uri.EscapeDataString(search)));
             }
-            if (skiptoken != null)
+            if (filter != null)
             {
-                _queryParameters.Add(string.Format("$skiptoken={0}", System.Uri.EscapeDataString(skiptoken)));
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -257,21 +257,21 @@ internal CustomersOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists customers which the current user can work with on-behalf of a
-        /// partner.
+        /// Lists the customers that are billed to a billing account. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='search'>
+        /// Used for searching customers by their name. Any customer with name
+        /// containing the search text will be included in the response
         /// </param>
         /// <param name='filter'>
         /// May be used to filter the list of customers.
         /// </param>
-        /// <param name='skiptoken'>
-        /// Skiptoken is only used if a previous operation returned a partial result.
-        /// If a previous response contains a nextLink element, the value of the
-        /// nextLink element will include a skiptoken parameter that specifies a
-        /// starting point to use for subsequent calls.
-        /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
         /// </param>
@@ -293,7 +293,7 @@ internal CustomersOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Customer>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), string skiptoken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Customer>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string search = default(string), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -311,8 +311,8 @@ internal CustomersOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("search", search);
                 tracingParameters.Add("filter", filter);
-                tracingParameters.Add("skiptoken", skiptoken);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
             }
@@ -325,13 +325,13 @@ internal CustomersOperations(BillingManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (filter != null)
+            if (search != null)
             {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+                _queryParameters.Add(string.Format("$search={0}", System.Uri.EscapeDataString(search)));
             }
-            if (skiptoken != null)
+            if (filter != null)
             {
-                _queryParameters.Add(string.Format("$skiptoken={0}", System.Uri.EscapeDataString(skiptoken)));
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
             }
             if (_queryParameters.Count > 0)
             {
@@ -454,16 +454,18 @@ internal CustomersOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Gets a customer by its id.
+        /// Gets a customer by its ID. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand enabledAzurePlans, resellers.
+        /// May be used to expand enabledAzurePlans and resellers
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -648,8 +650,10 @@ internal CustomersOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists customers by billing profile which the current user can work with
-        /// on-behalf of a partner.
+        /// Lists the customers that are billed to a billing profile. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -817,8 +821,10 @@ internal CustomersOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists customers which the current user can work with on-behalf of a
-        /// partner.
+        /// Lists the customers that are billed to a billing account. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperationsExtensions.cs
index e047020c08119..feace61fe2273 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/CustomersOperationsExtensions.cs
@@ -22,133 +22,135 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class CustomersOperationsExtensions
     {
             /// <summary>
-            /// Lists customers by billing profile which the current user can work with
-            /// on-behalf of a partner.
+            /// Lists the customers that are billed to a billing profile. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='search'>
+            /// Used for searching customers by their name. Any customer with name
+            /// containing the search text will be included in the response
             /// </param>
             /// <param name='filter'>
             /// May be used to filter the list of customers.
             /// </param>
-            /// <param name='skiptoken'>
-            /// Skiptoken is only used if a previous operation returned a partial result.
-            /// If a previous response contains a nextLink element, the value of the
-            /// nextLink element will include a skiptoken parameter that specifies a
-            /// starting point to use for subsequent calls.
-            /// </param>
-            public static IPage<Customer> ListByBillingProfile(this ICustomersOperations operations, string billingAccountName, string billingProfileName, string filter = default(string), string skiptoken = default(string))
+            public static IPage<Customer> ListByBillingProfile(this ICustomersOperations operations, string billingAccountName, string billingProfileName, string search = default(string), string filter = default(string))
             {
-                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName, filter, skiptoken).GetAwaiter().GetResult();
+                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName, search, filter).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists customers by billing profile which the current user can work with
-            /// on-behalf of a partner.
+            /// Lists the customers that are billed to a billing profile. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='search'>
+            /// Used for searching customers by their name. Any customer with name
+            /// containing the search text will be included in the response
             /// </param>
             /// <param name='filter'>
             /// May be used to filter the list of customers.
             /// </param>
-            /// <param name='skiptoken'>
-            /// Skiptoken is only used if a previous operation returned a partial result.
-            /// If a previous response contains a nextLink element, the value of the
-            /// nextLink element will include a skiptoken parameter that specifies a
-            /// starting point to use for subsequent calls.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Customer>> ListByBillingProfileAsync(this ICustomersOperations operations, string billingAccountName, string billingProfileName, string filter = default(string), string skiptoken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Customer>> ListByBillingProfileAsync(this ICustomersOperations operations, string billingAccountName, string billingProfileName, string search = default(string), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, filter, skiptoken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, search, filter, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists customers which the current user can work with on-behalf of a
-            /// partner.
+            /// Lists the customers that are billed to a billing account. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='search'>
+            /// Used for searching customers by their name. Any customer with name
+            /// containing the search text will be included in the response
             /// </param>
             /// <param name='filter'>
             /// May be used to filter the list of customers.
             /// </param>
-            /// <param name='skiptoken'>
-            /// Skiptoken is only used if a previous operation returned a partial result.
-            /// If a previous response contains a nextLink element, the value of the
-            /// nextLink element will include a skiptoken parameter that specifies a
-            /// starting point to use for subsequent calls.
-            /// </param>
-            public static IPage<Customer> ListByBillingAccount(this ICustomersOperations operations, string billingAccountName, string filter = default(string), string skiptoken = default(string))
+            public static IPage<Customer> ListByBillingAccount(this ICustomersOperations operations, string billingAccountName, string search = default(string), string filter = default(string))
             {
-                return operations.ListByBillingAccountAsync(billingAccountName, filter, skiptoken).GetAwaiter().GetResult();
+                return operations.ListByBillingAccountAsync(billingAccountName, search, filter).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists customers which the current user can work with on-behalf of a
-            /// partner.
+            /// Lists the customers that are billed to a billing account. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='search'>
+            /// Used for searching customers by their name. Any customer with name
+            /// containing the search text will be included in the response
             /// </param>
             /// <param name='filter'>
             /// May be used to filter the list of customers.
             /// </param>
-            /// <param name='skiptoken'>
-            /// Skiptoken is only used if a previous operation returned a partial result.
-            /// If a previous response contains a nextLink element, the value of the
-            /// nextLink element will include a skiptoken parameter that specifies a
-            /// starting point to use for subsequent calls.
-            /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Customer>> ListByBillingAccountAsync(this ICustomersOperations operations, string billingAccountName, string filter = default(string), string skiptoken = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Customer>> ListByBillingAccountAsync(this ICustomersOperations operations, string billingAccountName, string search = default(string), string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, filter, skiptoken, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, search, filter, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Gets a customer by its id.
+            /// Gets a customer by its ID. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand enabledAzurePlans, resellers.
+            /// May be used to expand enabledAzurePlans and resellers
             /// </param>
             public static Customer Get(this ICustomersOperations operations, string billingAccountName, string customerName, string expand = default(string))
             {
@@ -156,19 +158,21 @@ public static partial class CustomersOperationsExtensions
             }
 
             /// <summary>
-            /// Gets a customer by its id.
+            /// Gets a customer by its ID. The operation is supported only for billing
+            /// accounts with agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='expand'>
-            /// May be used to expand enabledAzurePlans, resellers.
+            /// May be used to expand enabledAzurePlans and resellers
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -182,8 +186,10 @@ public static partial class CustomersOperationsExtensions
             }
 
             /// <summary>
-            /// Lists customers by billing profile which the current user can work with
-            /// on-behalf of a partner.
+            /// Lists the customers that are billed to a billing profile. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -197,8 +203,10 @@ public static IPage<Customer> ListByBillingProfileNext(this ICustomersOperations
             }
 
             /// <summary>
-            /// Lists customers by billing profile which the current user can work with
-            /// on-behalf of a partner.
+            /// Lists the customers that are billed to a billing profile. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -218,8 +226,10 @@ public static IPage<Customer> ListByBillingProfileNext(this ICustomersOperations
             }
 
             /// <summary>
-            /// Lists customers which the current user can work with on-behalf of a
-            /// partner.
+            /// Lists the customers that are billed to a billing account. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -233,8 +243,10 @@ public static IPage<Customer> ListByBillingAccountNext(this ICustomersOperations
             }
 
             /// <summary>
-            /// Lists customers which the current user can work with on-behalf of a
-            /// partner.
+            /// Lists the customers that are billed to a billing account. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Partner
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAddressOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAddressOperations.cs
index 0497e1cfd7e94..bdce96e8c9b85 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAddressOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAddressOperations.cs
@@ -24,7 +24,9 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IAddressOperations
     {
         /// <summary>
-        /// Validates the address.
+        /// Validates an address. Use the operation to validate an address
+        /// before using it as soldTo or a billTo address.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='address'>
         /// </param>
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAgreementsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAgreementsOperations.cs
index 8857e689506ba..cc4316dacee97 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAgreementsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAgreementsOperations.cs
@@ -24,10 +24,11 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IAgreementsOperations
     {
         /// <summary>
-        /// Lists all agreements for a billing account.
+        /// Lists the agreements for a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
         /// May be used to expand the participants.
@@ -47,15 +48,16 @@ public partial interface IAgreementsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<AgreementListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Agreement>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the agreement by name.
+        /// Gets an agreement by ID.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='agreementName'>
-        /// Agreement Id.
+        /// The ID that uniquely identifies an agreement.
         /// </param>
         /// <param name='expand'>
         /// May be used to expand the participants.
@@ -76,5 +78,28 @@ public partial interface IAgreementsOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<Agreement>> GetWithHttpMessagesAsync(string billingAccountName, string agreementName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the agreements for a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Agreement>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAvailableBalancesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAvailableBalancesOperations.cs
index 4afc7b3578eb4..4bb7400fb5b34 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAvailableBalancesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IAvailableBalancesOperations.cs
@@ -24,14 +24,17 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IAvailableBalancesOperations
     {
         /// <summary>
-        /// The latest available credit balance for a given billingAccountName
-        /// and billingProfileName.
+        /// The available credit balance for a billing profile. This is the
+        /// balance that can be used for pay now to settle due or past due
+        /// invoices. The operation is supported only for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -48,6 +51,6 @@ public partial interface IAvailableBalancesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<AvailableBalance>> GetByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<AvailableBalance>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingAccountsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingAccountsOperations.cs
index e3e91effa85d3..b20fbe01ba4ec 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingAccountsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingAccountsOperations.cs
@@ -24,11 +24,12 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingAccountsOperations
     {
         /// <summary>
-        /// Lists all billing accounts for a user which he has access to.
+        /// Lists the billing accounts that a user has access to.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='expand'>
-        /// May be used to expand the address, invoiceSections and
-        /// billingProfiles.
+        /// May be used to expand the soldTo, invoice sections and billing
+        /// profiles.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -45,16 +46,17 @@ public partial interface IBillingAccountsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingAccountListResult>> ListWithHttpMessagesAsync(string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingAccount>>> ListWithHttpMessagesAsync(string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the billing account by id.
+        /// Gets a billing account by its ID.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the address, invoiceSections and
-        /// billingProfiles.
+        /// May be used to expand the soldTo, invoice sections and billing
+        /// profiles.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -73,11 +75,41 @@ public partial interface IBillingAccountsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingAccount>> GetWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all invoice sections with create subscription permission for
-        /// a user.
+        /// Updates the properties of a billing account. Currently, displayName
+        /// and address can be updated. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing account
+        /// operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingAccount>> UpdateWithHttpMessagesAsync(string billingAccountName, BillingAccountUpdateRequest parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoice sections for which the user has permission to
+        /// create Azure subscriptions. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -96,8 +128,61 @@ public partial interface IBillingAccountsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<InvoiceSectionWithCreateSubPermission>>> ListInvoiceSectionsByCreateSubscriptionPermissionWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all invoice sections with create subscription permission for
-        /// a user.
+        /// Updates the properties of a billing account. Currently, displayName
+        /// and address can be updated. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing account
+        /// operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingAccount>> BeginUpdateWithHttpMessagesAsync(string billingAccountName, BillingAccountUpdateRequest parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing accounts that a user has access to.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingAccount>>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoice sections for which the user has permission to
+        /// create Azure subscriptions. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingManagementClient.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingManagementClient.cs
index dfccbe2401946..03374ac787665 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingManagementClient.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingManagementClient.cs
@@ -42,13 +42,13 @@ public partial interface IBillingManagementClient : System.IDisposable
         ServiceClientCredentials Credentials { get; }
 
         /// <summary>
-        /// Version of the API to be used with the client request. The current
-        /// version is 2019-10-01-preview.
+        /// The version of the API to be used with the client request. The
+        /// current version is 2020-05-01.
         /// </summary>
         string ApiVersion { get; }
 
         /// <summary>
-        /// Azure Subscription ID.
+        /// The ID that uniquely identifies an Azure subscription.
         /// </summary>
         string SubscriptionId { get; set; }
 
@@ -76,11 +76,6 @@ public partial interface IBillingManagementClient : System.IDisposable
         /// </summary>
         IBillingAccountsOperations BillingAccounts { get; }
 
-        /// <summary>
-        /// Gets the IPaymentMethodsOperations.
-        /// </summary>
-        IPaymentMethodsOperations PaymentMethods { get; }
-
         /// <summary>
         /// Gets the IAddressOperations.
         /// </summary>
@@ -91,6 +86,11 @@ public partial interface IBillingManagementClient : System.IDisposable
         /// </summary>
         IAvailableBalancesOperations AvailableBalances { get; }
 
+        /// <summary>
+        /// Gets the IInstructionsOperations.
+        /// </summary>
+        IInstructionsOperations Instructions { get; }
+
         /// <summary>
         /// Gets the IBillingProfilesOperations.
         /// </summary>
@@ -121,20 +121,15 @@ public partial interface IBillingManagementClient : System.IDisposable
         /// </summary>
         IProductsOperations Products { get; }
 
-        /// <summary>
-        /// Gets the ITransactionsOperations.
-        /// </summary>
-        ITransactionsOperations Transactions { get; }
-        
         /// <summary>
         /// Gets the IInvoicesOperations.
         /// </summary>
         IInvoicesOperations Invoices { get; }
 
         /// <summary>
-        /// Gets the IPriceSheetOperations.
+        /// Gets the ITransactionsOperations.
         /// </summary>
-        IPriceSheetOperations PriceSheet { get; }
+        ITransactionsOperations Transactions { get; }
 
         /// <summary>
         /// Gets the IPoliciesOperations.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPermissionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPermissionsOperations.cs
index 13d471c026ea7..12dcf5666b33f 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPermissionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPermissionsOperations.cs
@@ -24,13 +24,14 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingPermissionsOperations
     {
         /// <summary>
-        /// Lists all billing permissions the caller has for a customer.
+        /// Lists the billing permissions the caller has for a customer.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -47,13 +48,13 @@ public partial interface IBillingPermissionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingPermissionsListResult>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all billing permissions for the caller under a billing
-        /// account.
+        /// Lists the billing permissions the caller has on a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -70,18 +71,19 @@ public partial interface IBillingPermissionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingPermissionsListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all billing permissions for the caller under invoice section.
+        /// Lists the billing permissions the caller has on an invoice section.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -98,15 +100,16 @@ public partial interface IBillingPermissionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingPermissionsListResult>> ListByInvoiceSectionsWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByInvoiceSectionsWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all billing permissions the caller has for a billing account.
+        /// Lists the billing permissions the caller has on a billing profile.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -123,6 +126,98 @@ public partial interface IBillingPermissionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingPermissionsListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingPermissionsProperties>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing permissions the caller has for a customer.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByCustomerNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing permissions the caller has on a billing account.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing permissions the caller has on an invoice section.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByInvoiceSectionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing permissions the caller has on a billing profile.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingPermissionsProperties>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingProfilesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingProfilesOperations.cs
index 96902795fcd9c..ebb48861f5f2c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingProfilesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingProfilesOperations.cs
@@ -24,14 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingProfilesOperations
     {
         /// <summary>
-        /// Lists all billing profiles for a user which that user has access
-        /// to.
+        /// Lists the billing profiles that a user has access to. The operation
+        /// is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the invoiceSections.
+        /// May be used to expand the invoice sections.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -48,18 +50,21 @@ public partial interface IBillingProfilesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingProfileListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingProfile>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the billing profile by id.
+        /// Gets a billing profile by its ID. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand the invoiceSections.
+        /// May be used to expand the invoice sections.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -77,5 +82,90 @@ public partial interface IBillingProfilesOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<BillingProfile>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Creates or updates a billing profile. The operation is supported
+        /// for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated billing profile.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingProfile,BillingProfilesCreateOrUpdateHeaders>> CreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingProfile parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Creates or updates a billing profile. The operation is supported
+        /// for billing accounts with agreement type Microsoft Customer
+        /// Agreement or Microsoft Partner Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated billing profile.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingProfile,BillingProfilesCreateOrUpdateHeaders>> BeginCreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingProfile parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the billing profiles that a user has access to. The operation
+        /// is supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingProfile>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPropertyOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPropertyOperations.cs
index 71374d3abd1bb..918c3a7b4a13d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPropertyOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingPropertyOperations.cs
@@ -24,7 +24,9 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingPropertyOperations
     {
         /// <summary>
-        /// Get billing property by subscription Id.
+        /// Get the billing properties for a subscription. This operation is
+        /// not supported for billing accounts with agreement type Enterprise
+        /// Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='customHeaders'>
@@ -43,5 +45,30 @@ public partial interface IBillingPropertyOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<BillingProperty>> GetWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Updates the billing property of a subscription. Currently, cost
+        /// center can be updated. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing property
+        /// operation.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<BillingProperty>> UpdateWithHttpMessagesAsync(BillingProperty parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleAssignmentsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleAssignmentsOperations.cs
index dfd967c254184..694bccf300136 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleAssignmentsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleAssignmentsOperations.cs
@@ -24,13 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingRoleAssignmentsOperations
     {
         /// <summary>
-        /// Get the role assignment for the caller
+        /// Gets a role assignment for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,13 +52,15 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> GetByBillingAccountWithHttpMessagesAsync(string billingAccountName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Delete the role assignment on this billing account
+        /// Deletes a role assignment for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -74,19 +79,22 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> DeleteByBillingAccountWithHttpMessagesAsync(string billingAccountName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the role assignment for the caller on the invoice Section
+        /// Gets a role assignment for the caller on an invoice section. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -105,19 +113,21 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> GetByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Delete the role assignment on the invoice Section
+        /// Deletes a role assignment for the caller on an invoice section. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -136,16 +146,19 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> DeleteByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the role assignment for the caller on the Billing Profile
+        /// Gets a role assignment for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -164,16 +177,18 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> GetByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Delete the role assignment on this Billing Profile
+        /// Deletes a role assignment for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleAssignmentName'>
-        /// role assignment id.
+        /// The ID that uniquely identifies a role assignment.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -192,10 +207,13 @@ public partial interface IBillingRoleAssignmentsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleAssignment>> DeleteByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string billingRoleAssignmentName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the role assignments on the Billing Account
+        /// Lists the role assignments for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -212,15 +230,21 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to add a role assignment to a billing account.
+        /// Lists the role assignments for the caller on an invoice section.
+        /// The operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -237,18 +261,18 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByBillingAccountWithHttpMessagesAsync(string billingAccountName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the role assignments on the invoice Section
+        /// Lists the role assignments for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -265,21 +289,15 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to add a role assignment to a invoice Section.
+        /// Lists the role assignments for the caller on a billing account. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <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.
@@ -296,15 +314,15 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the role assignments on the Billing Profile
+        /// Lists the role assignments for the caller on an invoice section.
+        /// The operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// <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.
@@ -321,18 +339,15 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByInvoiceSectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to add a role assignment to a billing profile.
+        /// Lists the role assignments for the caller on a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='parameters'>
-        /// Parameters supplied to add a role assignment.
+        /// <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.
@@ -349,6 +364,6 @@ public partial interface IBillingRoleAssignmentsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleAssignmentListResult>> AddByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, BillingRoleAssignmentPayload parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleAssignment>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleDefinitionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleDefinitionsOperations.cs
index 6de9603a2bcbb..5e57e22c27af6 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleDefinitionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingRoleDefinitionsOperations.cs
@@ -24,13 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingRoleDefinitionsOperations
     {
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on a billing account. The operation
+        /// is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -49,19 +52,22 @@ public partial interface IBillingRoleDefinitionsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleDefinition>> GetByBillingAccountWithHttpMessagesAsync(string billingAccountName, string billingRoleDefinitionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on an invoice section. The operation
+        /// is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -80,16 +86,19 @@ public partial interface IBillingRoleDefinitionsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleDefinition>> GetByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingRoleDefinitionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the role definition for a role
+        /// Gets the definition for a role on a billing profile. The operation
+        /// is supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='billingRoleDefinitionName'>
-        /// role definition id.
+        /// The ID that uniquely identifies a role definition.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -108,10 +117,13 @@ public partial interface IBillingRoleDefinitionsOperations
         /// </exception>
         Task<AzureOperationResponse<BillingRoleDefinition>> GetByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string billingRoleDefinitionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the role definition for a billing account
+        /// Lists the role definitions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -128,18 +140,21 @@ public partial interface IBillingRoleDefinitionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the role definition for an invoice Section
+        /// Lists the role definitions for an invoice section. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -156,15 +171,18 @@ public partial interface IBillingRoleDefinitionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the role definition for a Billing Profile
+        /// Lists the role definitions for a billing profile. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -181,6 +199,81 @@ public partial interface IBillingRoleDefinitionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingRoleDefinitionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingRoleDefinition>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the role definitions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the role definitions for an invoice section. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByInvoiceSectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the role definitions for a billing profile. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingRoleDefinition>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingSubscriptionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingSubscriptionsOperations.cs
index 6f0f5e80e8aca..1252a8bf6f7cc 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingSubscriptionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IBillingSubscriptionsOperations.cs
@@ -24,14 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IBillingSubscriptionsOperations
     {
         /// <summary>
-        /// Lists billing subscription by customer id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a customer. The operation is supported
+        /// only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -50,17 +52,13 @@ public partial interface IBillingSubscriptionsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get a single billing subscription by id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -77,13 +75,18 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingSubscription>> GetByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string billingSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists billing subscriptions by billing account name.
+        /// Lists the subscriptions that are billed to a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -100,16 +103,21 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists billing subscriptions by billing profile name.
+        /// Lists the subscriptions that are billed to an invoice section. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -126,19 +134,15 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingSubscriptionsListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists billing subscription by invoice section name.
+        /// Gets a subscription by its ID. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// and Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -155,22 +159,18 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingSubscriptionsListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<BillingSubscription>> GetWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get a single billing subscription by name.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// Updates the properties of a billing subscription. Currently, cost
+        /// center can be updated. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the update billing
+        /// subscription operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -187,25 +187,19 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<BillingSubscription>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<BillingSubscription>> UpdateWithHttpMessagesAsync(string billingAccountName, BillingSubscription parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Transfers the subscription from one invoice section to another
-        /// within a billing account.
+        /// Moves a subscription's charges to a new invoice section. The new
+        /// invoice section must belong to the same billing profile as the
+        /// existing invoice section. This operation is supported for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Request parameters supplied to the Transfer Billing Subscription
+        /// Request parameters that are provided to the move subscription
         /// operation.
         /// </param>
         /// <param name='customHeaders'>
@@ -223,25 +217,19 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders>> TransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders>> MoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Validates the transfer of billing subscriptions across invoice
-        /// sections.
+        /// Validates if a subscription's charges can be moved to a new invoice
+        /// section. This operation is supported for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Billing Subscription operation.
+        /// Request parameters that are provided to the validate move
+        /// eligibility operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -258,25 +246,19 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ValidateSubscriptionTransferEligibilityResult>> ValidateTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<ValidateSubscriptionTransferEligibilityResult>> ValidateMoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Transfers the subscription from one invoice section to another
-        /// within a billing account.
+        /// Moves a subscription's charges to a new invoice section. The new
+        /// invoice section must belong to the same billing profile as the
+        /// existing invoice section. This operation is supported for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='parameters'>
-        /// Request parameters supplied to the Transfer Billing Subscription
+        /// Request parameters that are provided to the move subscription
         /// operation.
         /// </param>
         /// <param name='customHeaders'>
@@ -294,10 +276,12 @@ public partial interface IBillingSubscriptionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<TransferBillingSubscriptionResult,BillingSubscriptionsTransferHeaders>> BeginTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string billingSubscriptionName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<BillingSubscription,BillingSubscriptionsMoveHeaders>> BeginMoveWithHttpMessagesAsync(string billingAccountName, TransferBillingSubscriptionRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists billing subscription by customer id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
+        /// Lists the subscriptions for a customer. The operation is supported
+        /// only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -319,7 +303,9 @@ public partial interface IBillingSubscriptionsOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByCustomerNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists billing subscriptions by billing account name.
+        /// Lists the subscriptions for a billing account. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Customer Agreement or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -341,5 +327,55 @@ public partial interface IBillingSubscriptionsOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<IPage<BillingSubscription>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the subscriptions that are billed to a billing profile. The
+        /// operation is supported for billing accounts with agreement type
+        /// Microsoft Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingSubscription>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the subscriptions that are billed to an invoice section. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<BillingSubscription>>> ListByInvoiceSectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ICustomersOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ICustomersOperations.cs
index 127391a153932..a35aebad63e11 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ICustomersOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ICustomersOperations.cs
@@ -24,24 +24,24 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface ICustomersOperations
     {
         /// <summary>
-        /// Lists customers by billing profile which the current user can work
-        /// with on-behalf of a partner.
+        /// Lists the customers that are billed to a billing profile. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='search'>
+        /// Used for searching customers by their name. Any customer with name
+        /// containing the search text will be included in the response
         /// </param>
         /// <param name='filter'>
         /// May be used to filter the list of customers.
         /// </param>
-        /// <param name='skiptoken'>
-        /// Skiptoken is only used if a previous operation returned a partial
-        /// result. If a previous response contains a nextLink element, the
-        /// value of the nextLink element will include a skiptoken parameter
-        /// that specifies a starting point to use for subsequent calls.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -57,23 +57,23 @@ public partial interface ICustomersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Customer>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string filter = default(string), string skiptoken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Customer>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string search = default(string), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists customers which the current user can work with on-behalf of a
-        /// partner.
+        /// Lists the customers that are billed to a billing account. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='search'>
+        /// Used for searching customers by their name. Any customer with name
+        /// containing the search text will be included in the response
         /// </param>
         /// <param name='filter'>
         /// May be used to filter the list of customers.
         /// </param>
-        /// <param name='skiptoken'>
-        /// Skiptoken is only used if a previous operation returned a partial
-        /// result. If a previous response contains a nextLink element, the
-        /// value of the nextLink element will include a skiptoken parameter
-        /// that specifies a starting point to use for subsequent calls.
-        /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
         /// </param>
@@ -89,18 +89,20 @@ public partial interface ICustomersOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Customer>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), string skiptoken = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Customer>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string search = default(string), string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets a customer by its id.
+        /// Gets a customer by its ID. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='expand'>
-        /// May be used to expand enabledAzurePlans, resellers.
+        /// May be used to expand enabledAzurePlans and resellers
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -119,8 +121,10 @@ public partial interface ICustomersOperations
         /// </exception>
         Task<AzureOperationResponse<Customer>> GetWithHttpMessagesAsync(string billingAccountName, string customerName, string expand = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists customers by billing profile which the current user can work
-        /// with on-behalf of a partner.
+        /// Lists the customers that are billed to a billing profile. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
@@ -142,8 +146,10 @@ public partial interface ICustomersOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<Customer>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists customers which the current user can work with on-behalf of a
-        /// partner.
+        /// Lists the customers that are billed to a billing account. The
+        /// operation is supported only for billing accounts with agreement
+        /// type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPaymentMethodsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInstructionsOperations.cs
similarity index 62%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPaymentMethodsOperations.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInstructionsOperations.cs
index ed7a123da510d..6f1f8810d35ec 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPaymentMethodsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInstructionsOperations.cs
@@ -19,16 +19,19 @@ namespace Microsoft.Azure.Management.Billing
     using System.Threading.Tasks;
 
     /// <summary>
-    /// PaymentMethodsOperations operations.
+    /// InstructionsOperations operations.
     /// </summary>
-    public partial interface IPaymentMethodsOperations
+    public partial interface IInstructionsOperations
     {
         /// <summary>
-        /// Lists the Payment Methods by billing account Id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
+        /// Lists the instructions by billing profile id.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -45,16 +48,20 @@ public partial interface IPaymentMethodsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Instruction>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the Payment Methods by billing profile Id.
+        /// Get the instruction by name. These are custom billing instructions
+        /// and are only applicable for certain customers.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='instructionName'>
+        /// Instruction Name.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -71,13 +78,22 @@ public partial interface IPaymentMethodsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Instruction>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string instructionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the Payment Methods by billing account Id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
+        /// Creates or updates an instruction. These are custom billing
+        /// instructions and are only applicable for certain customers.
         /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='instructionName'>
+        /// Instruction Name.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new instruction.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -94,9 +110,9 @@ public partial interface IPaymentMethodsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Instruction>> PutWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string instructionName, Instruction parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the Payment Methods by billing profile Id.
+        /// Lists the instructions by billing profile id.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -117,6 +133,6 @@ public partial interface IPaymentMethodsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Instruction>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoiceSectionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoiceSectionsOperations.cs
index 3a27d3b72e5ea..5d4c166485620 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoiceSectionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoiceSectionsOperations.cs
@@ -24,13 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IInvoiceSectionsOperations
     {
         /// <summary>
-        /// Lists all invoice sections for a user which he has access to.
+        /// Lists the invoice sections that a user has access to. The operation
+        /// is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -47,18 +50,21 @@ public partial interface IInvoiceSectionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<InvoiceSectionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<InvoiceSection>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the InvoiceSection by id.
+        /// Gets an invoice section by its ID. The operation is supported only
+        /// for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -77,16 +83,54 @@ public partial interface IInvoiceSectionsOperations
         /// </exception>
         Task<AzureOperationResponse<InvoiceSection>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Elevates the caller's access to match their billing profile access.
+        /// Creates or updates an invoice section. The operation is supported
+        /// only for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated invoice section.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders>> CreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Creates or updates an invoice section. The operation is supported
+        /// only for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -97,9 +141,37 @@ public partial interface IInvoiceSectionsOperations
         /// <exception cref="ErrorResponseException">
         /// 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<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders>> BeginCreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoice sections that a user has access to. The operation
+        /// is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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> ElevateToBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<InvoiceSection>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoicesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoicesOperations.cs
index 101b1e8699e54..f5e65474be404 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoicesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IInvoicesOperations.cs
@@ -24,16 +24,22 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IInvoicesOperations
     {
         /// <summary>
-        /// List of invoices for a billing account.
+        /// Lists the invoices for a billing account for a given start date and
+        /// end date. The operation is supported for billing accounts with
+        /// agreement type Microsoft Partner Agreement or Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='periodStartDate'>
-        /// Invoice period start date.
+        /// The start date to fetch the invoices. The date should be specified
+        /// in MM-DD-YYYY format.
         /// </param>
         /// <param name='periodEndDate'>
-        /// Invoice period end date.
+        /// The end date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -50,21 +56,27 @@ public partial interface IInvoicesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<InvoiceListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// List of invoices for a billing profile.
+        /// Lists the invoices for a billing profile for a given start date and
+        /// end date. The operation is supported for billing accounts with
+        /// agreement type Microsoft Partner Agreement or Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='periodStartDate'>
-        /// Invoice period start date.
+        /// The start date to fetch the invoices. The date should be specified
+        /// in MM-DD-YYYY format.
         /// </param>
         /// <param name='periodEndDate'>
-        /// Invoice period end date.
+        /// The end date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -81,18 +93,43 @@ public partial interface IInvoicesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<InvoiceListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get the invoice by name.
+        /// Gets an invoice by billing account name and ID. The operation is
+        /// supported for billing accounts with agreement type Microsoft
+        /// Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
         /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<Invoice>> GetWithHttpMessagesAsync(string billingAccountName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Gets an invoice by ID. The operation is supported for billing
+        /// accounts with agreement type Microsoft Partner Agreement or
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
         /// <param name='invoiceName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies an invoice.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -109,17 +146,42 @@ public partial interface IInvoicesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Invoice>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Invoice>> GetByIdWithHttpMessagesAsync(string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists invoices by billing subscriptions name.
+        /// Gets a URL to download an invoice. The operation is supported for
+        /// billing accounts with agreement type Microsoft Partner Agreement or
+        /// Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
         /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
         /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadInvoiceHeaders>> DownloadInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoices for a subscription.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
         /// <param name='periodStartDate'>
         /// Invoice period start date.
         /// </param>
@@ -141,19 +203,148 @@ public partial interface IInvoicesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingSubscriptionWithHttpMessagesAsync(string billingAccountName, string billingSubscriptionName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingSubscriptionWithHttpMessagesAsync(string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Gets an invoice by subscription ID and invoice ID.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<Invoice>> GetBySubscriptionAndInvoiceIdWithHttpMessagesAsync(string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Gets the invoice by name.
+        /// Gets a URL to download an invoice.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders>> DownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Gets a URL to download an invoice. The operation is supported for
+        /// billing accounts with agreement type Microsoft Partner Agreement or
+        /// Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
         /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
         /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadInvoiceHeaders>> BeginDownloadInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Gets a URL to download an invoice.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
         /// <param name='invoiceName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders>> BeginDownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoices for a billing account for a given start date and
+        /// end date. The operation is supported for billing accounts with
+        /// agreement type Microsoft Partner Agreement or Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Invoice>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the invoices for a billing profile for a given start date and
+        /// end date. The operation is supported for billing accounts with
+        /// agreement type Microsoft Partner Agreement or Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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.
@@ -170,9 +361,9 @@ public partial interface IInvoicesOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Invoice>> GetByIdWithHttpMessagesAsync(string billingAccountName, string billingSubscriptionName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists invoices by billing subscriptions name.
+        /// Lists the invoices for a subscription.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IOperations.cs
index 7bbaf066eb9ad..ecace1e9febc9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IOperations.cs
@@ -24,7 +24,8 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IOperations
     {
         /// <summary>
-        /// Lists all of the available billing REST API operations.
+        /// Lists the available billing REST API operations.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -43,7 +44,8 @@ public partial interface IOperations
         /// </exception>
         Task<AzureOperationResponse<IPage<Operation>>> ListWithHttpMessagesAsync(Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists all of the available billing REST API operations.
+        /// Lists the available billing REST API operations.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPoliciesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPoliciesOperations.cs
index 63b1c823dc837..c1afd82beb18a 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPoliciesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPoliciesOperations.cs
@@ -24,15 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IPoliciesOperations
     {
         /// <summary>
-        /// The policy for a given billing account name and billing profile
-        /// name.
+        /// Lists the policies for a billing profile. This operation is
+        /// supported only for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -51,16 +52,19 @@ public partial interface IPoliciesOperations
         /// </exception>
         Task<AzureOperationResponse<Policy>> GetByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to update a policy.
+        /// Updates the policies for a billing profile. This operation is
+        /// supported only for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the update policy operation.
+        /// Request parameters that are provided to the update policies
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -79,14 +83,16 @@ public partial interface IPoliciesOperations
         /// </exception>
         Task<AzureOperationResponse<Policy>> UpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Policy parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The policy for a given billing account name and customer name.
+        /// Lists the policies for a customer. This operation is supported only
+        /// for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -105,16 +111,19 @@ public partial interface IPoliciesOperations
         /// </exception>
         Task<AzureOperationResponse<CustomerPolicy>> GetByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to update a Customer policy.
+        /// Updates the policies for a customer. This operation is supported
+        /// only for billing accounts with agreement type Microsoft Partner
+        /// Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the update customer policy operation.
+        /// Request parameters that are provided to the update policies
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPriceSheetOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPriceSheetOperations.cs
deleted file mode 100644
index d86f105889807..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IPriceSheetOperations.cs
+++ /dev/null
@@ -1,133 +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.Billing
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// PriceSheetOperations operations.
-    /// </summary>
-    public partial interface IPriceSheetOperations
-    {
-        /// <summary>
-        /// Download price sheet for an invoice.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceName'>
-        /// Invoice Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadHeaders>> DownloadWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Download price sheet for a billing profile.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders>> DownloadByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Download price sheet for an invoice.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceName'>
-        /// Invoice Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadHeaders>> BeginDownloadWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Download price sheet for a billing profile.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders>> BeginDownloadByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IProductsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IProductsOperations.cs
index b6be7ff53256e..d3fbf2d36b42f 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IProductsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/IProductsOperations.cs
@@ -24,20 +24,16 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface IProductsOperations
     {
         /// <summary>
-        /// Lists products by customer id.
+        /// Lists the products for a customer. These don't include products
+        /// billed based on usage.The operation is supported only for billing
+        /// accounts with agreement type Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by product type. The filter supports 'eq',
-        /// 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support
-        /// 'ne', 'or', or 'not'. Tag filter is a key value pair string where
-        /// key and value is separated by a colon (:).
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -54,19 +50,22 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProductsListResult>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Product>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get a customer's product by name.
+        /// Lists the products for a billing account. These don't include
+        /// products billed based on usage. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='productName'>
-        /// Invoice Id.
+        /// <param name='filter'>
+        /// May be used to filter by product type. The filter supports 'eq',
+        /// 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support
+        /// 'ne', 'or', or 'not'. Tag filter is a key value pair string where
+        /// key and value are separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -83,19 +82,25 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Product>> GetByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists products by billing account name.
+        /// Lists the products for a billing profile. These don't include
+        /// products billed based on usage. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='filter'>
         /// May be used to filter by product type. The filter supports 'eq',
         /// 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support
         /// 'ne', 'or', or 'not'. Tag filter is a key value pair string where
-        /// key and value is separated by a colon (:).
+        /// key and value are separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -112,25 +117,27 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Product>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists products by invoice section name.
+        /// Lists the products for an invoice section. These don't include
+        /// products billed based on usage. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='filter'>
         /// May be used to filter by product type. The filter supports 'eq',
         /// 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently support
         /// 'ne', 'or', or 'not'. Tag filter is a key value pair string where
-        /// key and value is separated by a colon (:).
+        /// key and value are separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -147,22 +154,17 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ProductsListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Product>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Get a single product by name.
+        /// Gets a product by ID. The operation is supported only for billing
+        /// accounts with agreement type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -179,24 +181,21 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Product>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Product>> GetWithHttpMessagesAsync(string billingAccountName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// The operation to transfer a Product to another invoice section.
+        /// Updates the properties of a Product. Currently, auto renew can be
+        /// updated. The operation is supported only for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Product operation.
+        /// Request parameters that are provided to the update product
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -213,24 +212,23 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<Product,ProductsTransferHeaders>> TransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Product>> UpdateWithHttpMessagesAsync(string billingAccountName, string productName, Product parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Validates the transfer of products across invoice sections.
+        /// Moves a product's charges to a new invoice section. The new invoice
+        /// section must belong to the same billing profile as the existing
+        /// invoice section. This operation is supported only for products that
+        /// are purchased with a recurring charge and for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Products operation.
+        /// Request parameters that are provided to the move product operation.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -247,25 +245,48 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<ValidateProductTransferEligibilityResult>> ValidateTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<Product,ProductsMoveHeaders>> MoveWithHttpMessagesAsync(string billingAccountName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Cancel auto renew for product by product id and invoice section
-        /// name
+        /// Validates if a product's charges can be moved to a new invoice
+        /// section. This operation is supported only for products that are
+        /// purchased with a recurring charge and for billing accounts with
+        /// agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// <param name='productName'>
+        /// The ID that uniquely identifies a product.
         /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the validate move
+        /// eligibility operation.
         /// </param>
-        /// <param name='productName'>
-        /// Invoice Id.
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
         /// </param>
-        /// <param name='body'>
-        /// Update auto renew request parameters.
+        /// <exception cref="ErrorResponseException">
+        /// 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<ValidateProductTransferEligibilityResult>> ValidateMoveWithHttpMessagesAsync(string billingAccountName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the products for a customer. These don't include products
+        /// billed based on usage.The operation is supported only for billing
+        /// accounts with agreement type Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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.
@@ -282,9 +303,12 @@ public partial interface IProductsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<UpdateAutoRenewOperation>> UpdateAutoRenewByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, UpdateAutoRenewRequest body, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Product>>> ListByCustomerNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists products by billing account name.
+        /// Lists the products for a billing account. These don't include
+        /// products billed based on usage. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -306,5 +330,56 @@ public partial interface IProductsOperations
         /// Thrown when a required parameter is null
         /// </exception>
         Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the products for a billing profile. These don't include
+        /// products billed based on usage. The operation is supported for
+        /// billing accounts with agreement type Microsoft Customer Agreement
+        /// or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Product>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// Lists the products for an invoice section. These don't include
+        /// products billed based on usage. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Product>>> ListByInvoiceSectionNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ITransactionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ITransactionsOperations.cs
index c45367cbf434b..4f8e8eff78117 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ITransactionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ITransactionsOperations.cs
@@ -24,203 +24,15 @@ namespace Microsoft.Azure.Management.Billing
     public partial interface ITransactionsOperations
     {
         /// <summary>
-        /// Lists the transactions by customer id for given start date and end
-        /// date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports
-        /// 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently
-        /// support 'ne', 'or', or 'not'. Tag filter is a key value pair string
-        /// where key and value is separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<Transaction>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Lists the transactions by billing account name for given start and
-        /// end date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports
-        /// 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently
-        /// support 'ne', 'or', or 'not'. Tag filter is a key value pair string
-        /// where key and value is separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<Transaction>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Lists the transactions by billing profile name for given start date
-        /// and end date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports
-        /// 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently
-        /// support 'ne', 'or', or 'not'. Tag filter is a key value pair string
-        /// where key and value is separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<TransactionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Lists the transactions by invoice section name for given start date
-        /// and end date.
+        /// Lists the transactions for an invoice. Transactions include
+        /// purchases, refunds and Azure usage charges.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports
-        /// 'eq', 'lt', 'gt', 'le', 'ge', and 'and'. It does not currently
-        /// support 'ne', 'or', or 'not'. Tag filter is a key value pair string
-        /// where key and value is separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<TransactionListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Get the transaction.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='transactionName'>
-        /// Transaction name.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<Transaction>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string transactionName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
-        /// <summary>
-        /// Lists the transactions by customer id for given start date and end
-        /// date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-        /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -237,10 +49,10 @@ public partial interface ITransactionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Transaction>>> ListByCustomerNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Transaction>>> ListByInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
-        /// Lists the transactions by billing account name for given start and
-        /// end date.
+        /// Lists the transactions for an invoice. Transactions include
+        /// purchases, refunds and Azure usage charges.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -261,6 +73,6 @@ public partial interface ITransactionsOperations
         /// <exception cref="Microsoft.Rest.ValidationException">
         /// Thrown when a required parameter is null
         /// </exception>
-        Task<AzureOperationResponse<IPage<Transaction>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
+        Task<AzureOperationResponse<IPage<Transaction>>> ListByInvoiceNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken));
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperations.cs
similarity index 82%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperations.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperations.cs
index e624b752ef7a7..8d35a98a38848 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperations.cs
@@ -23,12 +23,12 @@ namespace Microsoft.Azure.Management.Billing
     using System.Threading.Tasks;
 
     /// <summary>
-    /// PaymentMethodsOperations operations.
+    /// InstructionsOperations operations.
     /// </summary>
-    internal partial class PaymentMethodsOperations : IServiceOperations<BillingManagementClient>, IPaymentMethodsOperations
+    internal partial class InstructionsOperations : IServiceOperations<BillingManagementClient>, IInstructionsOperations
     {
         /// <summary>
-        /// Initializes a new instance of the PaymentMethodsOperations class.
+        /// Initializes a new instance of the InstructionsOperations class.
         /// </summary>
         /// <param name='client'>
         /// Reference to the service client.
@@ -36,7 +36,7 @@ internal partial class PaymentMethodsOperations : IServiceOperations<BillingMana
         /// <exception cref="System.ArgumentNullException">
         /// Thrown when a required parameter is null
         /// </exception>
-        internal PaymentMethodsOperations(BillingManagementClient client)
+        internal InstructionsOperations(BillingManagementClient client)
         {
             if (client == null)
             {
@@ -51,11 +51,14 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists the Payment Methods by billing account Id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
+        /// Lists the instructions by billing profile id.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -78,12 +81,16 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Instruction>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -96,13 +103,15 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/paymentMethods").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/instructions").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -196,7 +205,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PaymentMethod>>();
+            var _result = new AzureOperationResponse<IPage<Instruction>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -209,7 +218,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PaymentMethod>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Instruction>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -229,14 +238,18 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the Payment Methods by billing profile Id.
+        /// Get the instruction by name. These are custom billing instructions and are
+        /// only applicable for certain customers.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='instructionName'>
+        /// Instruction Name.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -259,8 +272,12 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Instruction>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string instructionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
@@ -269,9 +286,9 @@ internal PaymentMethodsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
             }
-            if (Client.ApiVersion == null)
+            if (instructionName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+                throw new ValidationException(ValidationRules.CannotBeNull, "instructionName");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -282,14 +299,16 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("instructionName", instructionName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/paymentMethods").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/instructions/{instructionName}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
             _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            _url = _url.Replace("{instructionName}", System.Uri.EscapeDataString(instructionName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -383,7 +402,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PaymentMethod>>();
+            var _result = new AzureOperationResponse<Instruction>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -396,7 +415,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PaymentMethod>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Instruction>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -416,11 +435,20 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the Payment Methods by billing account Id.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
+        /// Creates or updates an instruction. These are custom billing instructions
+        /// and are only applicable for certain customers.
         /// </summary>
-        /// <param name='nextPageLink'>
-        /// The NextLink from the previous successful call to List operation.
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='instructionName'>
+        /// Instruction Name.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new instruction.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -443,11 +471,31 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Instruction>> PutWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string instructionName, Instruction parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (nextPageLink == null)
+            if (Client.ApiVersion == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (billingAccountName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
+            }
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
+            if (instructionName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "instructionName");
+            }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
+            if (parameters != null)
+            {
+                parameters.Validate();
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -456,14 +504,24 @@ internal PaymentMethodsOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("nextPageLink", nextPageLink);
+                tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("billingProfileName", billingProfileName);
+                tracingParameters.Add("instructionName", instructionName);
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccountNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Put", 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("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/instructions/{instructionName}").ToString();
+            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
+            _url = _url.Replace("{instructionName}", System.Uri.EscapeDataString(instructionName));
             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);
@@ -471,7 +529,7 @@ internal PaymentMethodsOperations(BillingManagementClient 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)
@@ -502,6 +560,12 @@ internal PaymentMethodsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
+            if(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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)
             {
@@ -552,7 +616,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PaymentMethod>>();
+            var _result = new AzureOperationResponse<Instruction>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -565,7 +629,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PaymentMethod>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Instruction>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -585,7 +649,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the Payment Methods by billing profile Id.
+        /// Lists the instructions by billing profile id.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -612,7 +676,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<PaymentMethod>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Instruction>>> ListByBillingProfileNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -721,7 +785,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<IPage<PaymentMethod>>();
+            var _result = new AzureOperationResponse<IPage<Instruction>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -734,7 +798,7 @@ internal PaymentMethodsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<PaymentMethod>>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Instruction>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperationsExtensions.cs
new file mode 100644
index 0000000000000..449f73587cc05
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InstructionsOperationsExtensions.cs
@@ -0,0 +1,207 @@
+// <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.Billing
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Azure;
+    using Models;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Extension methods for InstructionsOperations.
+    /// </summary>
+    public static partial class InstructionsOperationsExtensions
+    {
+            /// <summary>
+            /// Lists the instructions by billing profile id.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            public static IPage<Instruction> ListByBillingProfile(this IInstructionsOperations operations, string billingAccountName, string billingProfileName)
+            {
+                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the instructions by billing profile id.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<IPage<Instruction>> ListByBillingProfileAsync(this IInstructionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Get the instruction by name. These are custom billing instructions and are
+            /// only applicable for certain customers.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='instructionName'>
+            /// Instruction Name.
+            /// </param>
+            public static Instruction Get(this IInstructionsOperations operations, string billingAccountName, string billingProfileName, string instructionName)
+            {
+                return operations.GetAsync(billingAccountName, billingProfileName, instructionName).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Get the instruction by name. These are custom billing instructions and are
+            /// only applicable for certain customers.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='instructionName'>
+            /// Instruction Name.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Instruction> GetAsync(this IInstructionsOperations operations, string billingAccountName, string billingProfileName, string instructionName, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, instructionName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Creates or updates an instruction. These are custom billing instructions
+            /// and are only applicable for certain customers.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='instructionName'>
+            /// Instruction Name.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new instruction.
+            /// </param>
+            public static Instruction Put(this IInstructionsOperations operations, string billingAccountName, string billingProfileName, string instructionName, Instruction parameters)
+            {
+                return operations.PutAsync(billingAccountName, billingProfileName, instructionName, parameters).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Creates or updates an instruction. These are custom billing instructions
+            /// and are only applicable for certain customers.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='instructionName'>
+            /// Instruction Name.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new instruction.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Instruction> PutAsync(this IInstructionsOperations operations, string billingAccountName, string billingProfileName, string instructionName, Instruction parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.PutWithHttpMessagesAsync(billingAccountName, billingProfileName, instructionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the instructions by billing profile id.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Instruction> ListByBillingProfileNext(this IInstructionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the instructions by billing profile id.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Instruction>> ListByBillingProfileNextAsync(this IInstructionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperations.cs
index 7d5c20abb616e..b3bc4425506bb 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperations.cs
@@ -51,13 +51,16 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all invoice sections for a user which he has access to.
+        /// Lists the invoice sections that a user has access to. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -80,7 +83,7 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<InvoiceSectionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<InvoiceSection>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -204,7 +207,7 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<InvoiceSectionListResult>();
+            var _result = new AzureOperationResponse<IPage<InvoiceSection>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -217,7 +220,7 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<InvoiceSectionListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<InvoiceSection>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -237,16 +240,18 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the InvoiceSection by id.
+        /// Gets an invoice section by its ID. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -432,16 +437,49 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Elevates the caller's access to match their billing profile access.
+        /// Creates or updates an invoice section. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated invoice section.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders>> CreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send Request
+            AzureOperationResponse<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders> _response = await BeginCreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Creates or updates an invoice section. The operation is supported only for
+        /// billing accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
+        /// </param>
+        /// <param name='invoiceSectionName'>
+        /// The ID that uniquely identifies an invoice section.
+        /// </param>
+        /// <param name='parameters'>
+        /// The new or updated invoice section.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -452,6 +490,9 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         /// <exception cref="ErrorResponseException">
         /// 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>
@@ -461,8 +502,12 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse> ElevateToBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders>> BeginCreateOrUpdateWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
@@ -475,6 +520,10 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
             }
+            if (parameters == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
+            }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
             string _invocationId = null;
@@ -485,16 +534,211 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("invoiceSectionName", invoiceSectionName);
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ElevateToBillingProfile", 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("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/elevate").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
             _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
             _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             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("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(parameters != null)
+            {
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<InvoiceSection,InvoiceSectionsCreateOrUpdateHeaders>();
+            _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<InvoiceSection>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            try
+            {
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<InvoiceSectionsCreateOrUpdateHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+            }
+            catch (JsonException ex)
+            {
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Lists the invoice sections that a user has access to. The operation is
+        /// supported only for billing accounts with agreement type Microsoft Customer
+        /// Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<InvoiceSection>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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);
@@ -502,7 +746,7 @@ internal InvoiceSectionsOperations(BillingManagementClient 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)
@@ -553,7 +797,7 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 204)
+            if ((int)_statusCode != 200)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -583,13 +827,31 @@ internal InvoiceSectionsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse();
+            var _result = new AzureOperationResponse<IPage<InvoiceSection>>();
             _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<InvoiceSection>>(_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);
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperationsExtensions.cs
index 7af286ac9968f..c64d66b02f9a2 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoiceSectionsOperationsExtensions.cs
@@ -22,38 +22,44 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class InvoiceSectionsOperationsExtensions
     {
             /// <summary>
-            /// Lists all invoice sections for a user which he has access to.
+            /// Lists the invoice sections that a user has access to. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
-            public static InvoiceSectionListResult ListByBillingProfile(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName)
+            public static IPage<InvoiceSection> ListByBillingProfile(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName)
             {
                 return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists all invoice sections for a user which he has access to.
+            /// Lists the invoice sections that a user has access to. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<InvoiceSectionListResult> ListByBillingProfileAsync(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<InvoiceSection>> ListByBillingProfileAsync(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -62,19 +68,21 @@ public static InvoiceSectionListResult ListByBillingProfile(this IInvoiceSection
             }
 
             /// <summary>
-            /// Get the InvoiceSection by id.
+            /// Gets an invoice section by its ID. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             public static InvoiceSection Get(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
             {
@@ -82,19 +90,21 @@ public static InvoiceSection Get(this IInvoiceSectionsOperations operations, str
             }
 
             /// <summary>
-            /// Get the InvoiceSection by id.
+            /// Gets an invoice section by its ID. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -106,48 +116,154 @@ public static InvoiceSection Get(this IInvoiceSectionsOperations operations, str
                     return _result.Body;
                 }
             }
-        
+
             /// <summary>
-            /// Elevates the caller's access to match their billing profile access.
+            /// Creates or updates an invoice section. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated invoice section.
             /// </param>
-            public static void ElevateToBillingProfile(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName)
+            public static InvoiceSection CreateOrUpdate(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters)
             {
-                operations.ElevateToBillingProfileAsync(billingAccountName, billingProfileName, invoiceSectionName).GetAwaiter().GetResult();
+                return operations.CreateOrUpdateAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Elevates the caller's access to match their billing profile access.
+            /// Creates or updates an invoice section. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated invoice section.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task ElevateToBillingProfileAsync(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<InvoiceSection> CreateOrUpdateAsync(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Creates or updates an invoice section. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated invoice section.
+            /// </param>
+            public static InvoiceSection BeginCreateOrUpdate(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters)
             {
-                (await operations.ElevateToBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, null, cancellationToken).ConfigureAwait(false)).Dispose();
+                return operations.BeginCreateOrUpdateAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters).GetAwaiter().GetResult();
             }
+
+            /// <summary>
+            /// Creates or updates an invoice section. The operation is supported only for
+            /// billing accounts with agreement type Microsoft Customer Agreement.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
+            /// </param>
+            /// <param name='invoiceSectionName'>
+            /// The ID that uniquely identifies an invoice section.
+            /// </param>
+            /// <param name='parameters'>
+            /// The new or updated invoice section.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<InvoiceSection> BeginCreateOrUpdateAsync(this IInvoiceSectionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, InvoiceSection parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginCreateOrUpdateWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoice sections that a user has access to. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<InvoiceSection> ListByBillingProfileNext(this IInvoiceSectionsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the invoice sections that a user has access to. The operation is
+            /// supported only for billing accounts with agreement type Microsoft Customer
+            /// Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<InvoiceSection>> ListByBillingProfileNextAsync(this IInvoiceSectionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperations.cs
index 4cac11ec28a39..23bb29215f1d9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperations.cs
@@ -51,16 +51,21 @@ internal InvoicesOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// List of invoices for a billing account.
+        /// Lists the invoices for a billing account for a given start date and end
+        /// date. The operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='periodStartDate'>
-        /// Invoice period start date.
+        /// The start date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='periodEndDate'>
-        /// Invoice period end date.
+        /// The end date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -83,7 +88,7 @@ internal InvoicesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<InvoiceListResult>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -219,7 +224,7 @@ internal InvoicesOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<InvoiceListResult>();
+            var _result = new AzureOperationResponse<IPage<Invoice>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -232,7 +237,7 @@ internal InvoicesOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<InvoiceListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Invoice>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -252,19 +257,24 @@ internal InvoicesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// List of invoices for a billing profile.
+        /// Lists the invoices for a billing profile for a given start date and end
+        /// date. The operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='periodStartDate'>
-        /// Invoice period start date.
+        /// The start date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='periodEndDate'>
-        /// Invoice period end date.
+        /// The end date to fetch the invoices. The date should be specified in
+        /// MM-DD-YYYY format.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -287,7 +297,7 @@ internal InvoicesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<InvoiceListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -429,7 +439,7 @@ internal InvoicesOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<InvoiceListResult>();
+            var _result = new AzureOperationResponse<IPage<Invoice>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -442,7 +452,7 @@ internal InvoicesOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<InvoiceListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Invoice>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -462,16 +472,16 @@ internal InvoicesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get the invoice by name.
+        /// Gets an invoice by billing account name and ID. The operation is supported
+        /// for billing accounts with agreement type Microsoft Partner Agreement or
+        /// Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='invoiceName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies an invoice.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -494,7 +504,7 @@ internal InvoicesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Invoice>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Invoice>> GetWithHttpMessagesAsync(string billingAccountName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (Client.ApiVersion == null)
             {
@@ -504,10 +514,6 @@ internal InvoicesOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
             if (invoiceName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
@@ -520,16 +526,14 @@ internal InvoicesOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("invoiceName", invoiceName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/{invoiceName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
             _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -657,15 +661,216 @@ internal InvoicesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists invoices by billing subscriptions name.
+        /// Gets an invoice by ID. The operation is supported for billing accounts with
+        /// agreement type Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<Invoice>> GetByIdWithHttpMessagesAsync(string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (invoiceName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("invoiceName", invoiceName);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "GetById", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/default/invoices/{invoiceName}").ToString();
+            _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
+            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Invoice>();
+            _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<Invoice>(_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 URL to download an invoice. The operation is supported for billing
+        /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+        /// Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
         /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
         /// </param>
+        public async Task<AzureOperationResponse<DownloadUrl,InvoicesDownloadInvoiceHeaders>> DownloadInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<DownloadUrl,InvoicesDownloadInvoiceHeaders> _response = await BeginDownloadInvoiceWithHttpMessagesAsync(billingAccountName, invoiceName, downloadToken, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Lists the invoices for a subscription.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
         /// <param name='periodStartDate'>
         /// Invoice period start date.
         /// </param>
@@ -693,15 +898,11 @@ internal InvoicesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingSubscriptionWithHttpMessagesAsync(string billingAccountName, string billingSubscriptionName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Invoice>>> ListByBillingSubscriptionWithHttpMessagesAsync(string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingSubscriptionName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
             if (periodStartDate == null)
             {
@@ -722,8 +923,6 @@ internal InvoicesOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
                 tracingParameters.Add("periodStartDate", periodStartDate);
                 tracingParameters.Add("periodEndDate", periodEndDate);
                 tracingParameters.Add("cancellationToken", cancellationToken);
@@ -731,9 +930,8 @@ internal InvoicesOperations(BillingManagementClient client)
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{billingSubscriptionName}/invoices").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/default/billingSubscriptions/{subscriptionId}/invoices").ToString();
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             List<string> _queryParameters = new List<string>();
             if (periodStartDate != null)
             {
@@ -868,17 +1066,11 @@ internal InvoicesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Gets the invoice by name.
+        /// Gets an invoice by subscription ID and invoice ID.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingSubscriptionName'>
-        /// Billing Subscription Id.
-        /// </param>
         /// <param name='invoiceName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies an invoice.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -901,15 +1093,11 @@ internal InvoicesOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Invoice>> GetByIdWithHttpMessagesAsync(string billingAccountName, string billingSubscriptionName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Invoice>> GetBySubscriptionAndInvoiceIdWithHttpMessagesAsync(string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
-            if (billingAccountName == null)
+            if (Client.SubscriptionId == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingSubscriptionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingSubscriptionName");
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
             }
             if (invoiceName == null)
             {
@@ -926,17 +1114,14 @@ internal InvoicesOperations(BillingManagementClient client)
             {
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingSubscriptionName", billingSubscriptionName);
                 tracingParameters.Add("invoiceName", invoiceName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetById", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "GetBySubscriptionAndInvoiceId", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingSubscriptions/{billingSubscriptionName}/invoices/{invoiceName}").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingSubscriptionName}", System.Uri.EscapeDataString(billingSubscriptionName));
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/default/billingSubscriptions/{subscriptionId}/invoices/{invoiceName}").ToString();
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
             _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -1064,7 +1249,794 @@ internal InvoicesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists invoices by billing subscriptions name.
+        /// Gets a URL to download an invoice.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// The headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        public async Task<AzureOperationResponse<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders>> DownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // Send request
+            AzureOperationResponse<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders> _response = await BeginDownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(invoiceName, downloadToken, customHeaders, cancellationToken).ConfigureAwait(false);
+            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary>
+        /// Gets a URL to download an invoice. The operation is supported for billing
+        /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='billingAccountName'>
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadInvoiceHeaders>> BeginDownloadInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (billingAccountName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
+            }
+            if (invoiceName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
+            }
+            if (downloadToken == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "downloadToken");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("invoiceName", invoiceName);
+                tracingParameters.Add("downloadToken", downloadToken);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginDownloadInvoice", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}/download").ToString();
+            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (downloadToken != null)
+            {
+                _queryParameters.Add(string.Format("downloadToken={0}", System.Uri.EscapeDataString(downloadToken)));
+            }
+            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<DownloadUrl,InvoicesDownloadInvoiceHeaders>();
+            _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<DownloadUrl>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            try
+            {
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<InvoicesDownloadInvoiceHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+            }
+            catch (JsonException ex)
+            {
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Gets a URL to download an invoice.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
+        /// </param>
+        /// <param name='downloadToken'>
+        /// Download token with document source and document ID.
+        /// </param>
+        /// <param name='customHeaders'>
+        /// Headers that will be added to request.
+        /// </param>
+        /// <param name='cancellationToken'>
+        /// The cancellation token.
+        /// </param>
+        /// <exception cref="ErrorResponseException">
+        /// 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<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders>> BeginDownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(string invoiceName, string downloadToken, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
+            if (Client.SubscriptionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+            }
+            if (invoiceName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
+            }
+            if (downloadToken == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "downloadToken");
+            }
+            // Tracing
+            bool _shouldTrace = ServiceClientTracing.IsEnabled;
+            string _invocationId = null;
+            if (_shouldTrace)
+            {
+                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
+                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
+                tracingParameters.Add("invoiceName", invoiceName);
+                tracingParameters.Add("downloadToken", downloadToken);
+                tracingParameters.Add("cancellationToken", cancellationToken);
+                ServiceClientTracing.Enter(_invocationId, this, "BeginDownloadBillingSubscriptionInvoice", tracingParameters);
+            }
+            // Construct URL
+            var _baseUrl = Client.BaseUri.AbsoluteUri;
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/default/billingSubscriptions/{subscriptionId}/invoices/{invoiceName}/download").ToString();
+            _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
+            _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
+            List<string> _queryParameters = new List<string>();
+            if (Client.ApiVersion != null)
+            {
+                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
+            }
+            if (downloadToken != null)
+            {
+                _queryParameters.Add(string.Format("downloadToken={0}", System.Uri.EscapeDataString(downloadToken)));
+            }
+            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<DownloadUrl,InvoicesDownloadBillingSubscriptionInvoiceHeaders>();
+            _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<DownloadUrl>(_responseContent, Client.DeserializationSettings);
+                }
+                catch (JsonException ex)
+                {
+                    _httpRequest.Dispose();
+                    if (_httpResponse != null)
+                    {
+                        _httpResponse.Dispose();
+                    }
+                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
+                }
+            }
+            try
+            {
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<InvoicesDownloadBillingSubscriptionInvoiceHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+            }
+            catch (JsonException ex)
+            {
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+            }
+            if (_shouldTrace)
+            {
+                ServiceClientTracing.Exit(_invocationId, _result);
+            }
+            return _result;
+        }
+
+        /// <summary>
+        /// Lists the invoices for a billing account for a given start date and end
+        /// date. The operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Invoice>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Invoice>>();
+            _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<Invoice>>(_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>
+        /// Lists the invoices for a billing profile for a given start date and end
+        /// date. The operation is supported for billing accounts with agreement type
+        /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Invoice>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Invoice>>();
+            _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<Invoice>>(_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>
+        /// Lists the invoices for a subscription.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperationsExtensions.cs
index 3fc286486009b..51e787b272ca4 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/InvoicesOperationsExtensions.cs
@@ -22,44 +22,54 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class InvoicesOperationsExtensions
     {
             /// <summary>
-            /// List of invoices for a billing account.
+            /// Lists the invoices for a billing account for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='periodStartDate'>
-            /// Invoice period start date.
+            /// The start date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='periodEndDate'>
-            /// Invoice period end date.
+            /// The end date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
-            public static InvoiceListResult ListByBillingAccount(this IInvoicesOperations operations, string billingAccountName, string periodStartDate, string periodEndDate)
+            public static IPage<Invoice> ListByBillingAccount(this IInvoicesOperations operations, string billingAccountName, string periodStartDate, string periodEndDate)
             {
                 return operations.ListByBillingAccountAsync(billingAccountName, periodStartDate, periodEndDate).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of invoices for a billing account.
+            /// Lists the invoices for a billing account for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='periodStartDate'>
-            /// Invoice period start date.
+            /// The start date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='periodEndDate'>
-            /// Invoice period end date.
+            /// The end date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<InvoiceListResult> ListByBillingAccountAsync(this IInvoicesOperations operations, string billingAccountName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Invoice>> ListByBillingAccountAsync(this IInvoicesOperations operations, string billingAccountName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, periodStartDate, periodEndDate, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -68,50 +78,60 @@ public static InvoiceListResult ListByBillingAccount(this IInvoicesOperations op
             }
 
             /// <summary>
-            /// List of invoices for a billing profile.
+            /// Lists the invoices for a billing profile for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='periodStartDate'>
-            /// Invoice period start date.
+            /// The start date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='periodEndDate'>
-            /// Invoice period end date.
+            /// The end date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
-            public static InvoiceListResult ListByBillingProfile(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate)
+            public static IPage<Invoice> ListByBillingProfile(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate)
             {
                 return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName, periodStartDate, periodEndDate).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// List of invoices for a billing profile.
+            /// Lists the invoices for a billing profile for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='periodStartDate'>
-            /// Invoice period start date.
+            /// The start date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='periodEndDate'>
-            /// Invoice period end date.
+            /// The end date to fetch the invoices. The date should be specified in
+            /// MM-DD-YYYY format.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<InvoiceListResult> ListByBillingProfileAsync(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Invoice>> ListByBillingProfileAsync(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, periodStartDate, periodEndDate, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -120,63 +140,147 @@ public static InvoiceListResult ListByBillingProfile(this IInvoicesOperations op
             }
 
             /// <summary>
-            /// Get the invoice by name.
+            /// Gets an invoice by billing account name and ID. The operation is supported
+            /// for billing accounts with agreement type Microsoft Partner Agreement or
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='invoiceName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies an invoice.
             /// </param>
-            public static Invoice Get(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string invoiceName)
+            public static Invoice Get(this IInvoicesOperations operations, string billingAccountName, string invoiceName)
             {
-                return operations.GetAsync(billingAccountName, billingProfileName, invoiceName).GetAwaiter().GetResult();
+                return operations.GetAsync(billingAccountName, invoiceName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get the invoice by name.
+            /// Gets an invoice by billing account name and ID. The operation is supported
+            /// for billing accounts with agreement type Microsoft Partner Agreement or
+            /// Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Invoice> GetAsync(this IInvoicesOperations operations, string billingAccountName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, invoiceName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Gets an invoice by ID. The operation is supported for billing accounts with
+            /// agreement type Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            public static Invoice GetById(this IInvoicesOperations operations, string invoiceName)
+            {
+                return operations.GetByIdAsync(invoiceName).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets an invoice by ID. The operation is supported for billing accounts with
+            /// agreement type Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
             /// </param>
             /// <param name='invoiceName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies an invoice.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Invoice> GetAsync(this IInvoicesOperations operations, string billingAccountName, string billingProfileName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Invoice> GetByIdAsync(this IInvoicesOperations operations, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetByIdWithHttpMessagesAsync(invoiceName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists invoices by billing subscriptions name.
+            /// Gets a URL to download an invoice. The operation is supported for billing
+            /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            public static DownloadUrl DownloadInvoice(this IInvoicesOperations operations, string billingAccountName, string invoiceName, string downloadToken)
+            {
+                return operations.DownloadInvoiceAsync(billingAccountName, invoiceName, downloadToken).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice. The operation is supported for billing
+            /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+            /// Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
             /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DownloadUrl> DownloadInvoiceAsync(this IInvoicesOperations operations, string billingAccountName, string invoiceName, string downloadToken, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.DownloadInvoiceWithHttpMessagesAsync(billingAccountName, invoiceName, downloadToken, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoices for a subscription.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
             /// </param>
             /// <param name='periodStartDate'>
             /// Invoice period start date.
@@ -184,24 +288,18 @@ public static Invoice Get(this IInvoicesOperations operations, string billingAcc
             /// <param name='periodEndDate'>
             /// Invoice period end date.
             /// </param>
-            public static IPage<Invoice> ListByBillingSubscription(this IInvoicesOperations operations, string billingAccountName, string billingSubscriptionName, string periodStartDate, string periodEndDate)
+            public static IPage<Invoice> ListByBillingSubscription(this IInvoicesOperations operations, string periodStartDate, string periodEndDate)
             {
-                return operations.ListByBillingSubscriptionAsync(billingAccountName, billingSubscriptionName, periodStartDate, periodEndDate).GetAwaiter().GetResult();
+                return operations.ListByBillingSubscriptionAsync(periodStartDate, periodEndDate).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists invoices by billing subscriptions name.
+            /// Lists the invoices for a subscription.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
-            /// </param>
             /// <param name='periodStartDate'>
             /// Invoice period start date.
             /// </param>
@@ -211,64 +309,268 @@ public static IPage<Invoice> ListByBillingSubscription(this IInvoicesOperations
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Invoice>> ListByBillingSubscriptionAsync(this IInvoicesOperations operations, string billingAccountName, string billingSubscriptionName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Invoice>> ListByBillingSubscriptionAsync(this IInvoicesOperations operations, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingSubscriptionWithHttpMessagesAsync(billingAccountName, billingSubscriptionName, periodStartDate, periodEndDate, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingSubscriptionWithHttpMessagesAsync(periodStartDate, periodEndDate, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Gets the invoice by name.
+            /// Gets an invoice by subscription ID and invoice ID.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            public static Invoice GetBySubscriptionAndInvoiceId(this IInvoicesOperations operations, string invoiceName)
+            {
+                return operations.GetBySubscriptionAndInvoiceIdAsync(invoiceName).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets an invoice by subscription ID and invoice ID.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<Invoice> GetBySubscriptionAndInvoiceIdAsync(this IInvoicesOperations operations, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.GetBySubscriptionAndInvoiceIdWithHttpMessagesAsync(invoiceName, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            public static DownloadUrl DownloadBillingSubscriptionInvoice(this IInvoicesOperations operations, string invoiceName, string downloadToken)
+            {
+                return operations.DownloadBillingSubscriptionInvoiceAsync(invoiceName, downloadToken).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
             /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DownloadUrl> DownloadBillingSubscriptionInvoiceAsync(this IInvoicesOperations operations, string invoiceName, string downloadToken, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.DownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(invoiceName, downloadToken, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice. The operation is supported for billing
+            /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='billingAccountName'>
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='invoiceName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
             /// </param>
-            public static Invoice GetById(this IInvoicesOperations operations, string billingAccountName, string billingSubscriptionName, string invoiceName)
+            public static DownloadUrl BeginDownloadInvoice(this IInvoicesOperations operations, string billingAccountName, string invoiceName, string downloadToken)
             {
-                return operations.GetByIdAsync(billingAccountName, billingSubscriptionName, invoiceName).GetAwaiter().GetResult();
+                return operations.BeginDownloadInvoiceAsync(billingAccountName, invoiceName, downloadToken).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Gets the invoice by name.
+            /// Gets a URL to download an invoice. The operation is supported for billing
+            /// accounts with agreement type Microsoft Partner Agreement or Microsoft
+            /// Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
             /// </param>
-            /// <param name='billingSubscriptionName'>
-            /// Billing Subscription Id.
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DownloadUrl> BeginDownloadInvoiceAsync(this IInvoicesOperations operations, string billingAccountName, string invoiceName, string downloadToken, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginDownloadInvoiceWithHttpMessagesAsync(billingAccountName, invoiceName, downloadToken, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            public static DownloadUrl BeginDownloadBillingSubscriptionInvoice(this IInvoicesOperations operations, string invoiceName, string downloadToken)
+            {
+                return operations.BeginDownloadBillingSubscriptionInvoiceAsync(invoiceName, downloadToken).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Gets a URL to download an invoice.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
             /// </param>
             /// <param name='invoiceName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies an invoice.
+            /// </param>
+            /// <param name='downloadToken'>
+            /// Download token with document source and document ID.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<DownloadUrl> BeginDownloadBillingSubscriptionInvoiceAsync(this IInvoicesOperations operations, string invoiceName, string downloadToken, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.BeginDownloadBillingSubscriptionInvoiceWithHttpMessagesAsync(invoiceName, downloadToken, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoices for a billing account for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Invoice> ListByBillingAccountNext(this IInvoicesOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the invoices for a billing account for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Invoice>> ListByBillingAccountNextAsync(this IInvoicesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the invoices for a billing profile for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Invoice> ListByBillingProfileNext(this IInvoicesOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the invoices for a billing profile for a given start date and end
+            /// date. The operation is supported for billing accounts with agreement type
+            /// Microsoft Partner Agreement or Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Invoice> GetByIdAsync(this IInvoicesOperations operations, string billingAccountName, string billingSubscriptionName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Invoice>> ListByBillingProfileNextAsync(this IInvoicesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetByIdWithHttpMessagesAsync(billingAccountName, billingSubscriptionName, invoiceName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists invoices by billing subscriptions name.
+            /// Lists the invoices for a subscription.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -283,7 +585,7 @@ public static IPage<Invoice> ListByBillingSubscriptionNext(this IInvoicesOperati
             }
 
             /// <summary>
-            /// Lists invoices by billing subscriptions name.
+            /// Lists the invoices for a subscription.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptTransferRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptTransferRequest.cs
deleted file mode 100644
index 551bc26630b99..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptTransferRequest.cs
+++ /dev/null
@@ -1,57 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Request parameters to accept transfer.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class AcceptTransferRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the AcceptTransferRequest class.
-        /// </summary>
-        public AcceptTransferRequest()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the AcceptTransferRequest class.
-        /// </summary>
-        /// <param name="productDetails">Request parameters to accept
-        /// transfer.</param>
-        public AcceptTransferRequest(IList<ProductDetails> productDetails = default(IList<ProductDetails>))
-        {
-            ProductDetails = productDetails;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets request parameters to accept transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.productDetails")]
-        public IList<ProductDetails> ProductDetails { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptanceMode.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptanceMode.cs
new file mode 100644
index 0000000000000..a6257a0c5c3de
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AcceptanceMode.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for AcceptanceMode.
+    /// </summary>
+    public static class AcceptanceMode
+    {
+        public const string ClickToAccept = "ClickToAccept";
+        public const string ESignEmbedded = "ESignEmbedded";
+        public const string ESignOffline = "ESignOffline";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EligibleProductType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountStatus.cs
similarity index 51%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EligibleProductType.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountStatus.cs
index 7e0f48d197d69..51802b73f8b75 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EligibleProductType.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountStatus.cs
@@ -12,12 +12,16 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for EligibleProductType.
+    /// Defines values for AccountStatus.
     /// </summary>
-    public static class EligibleProductType
+    public static class AccountStatus
     {
-        public const string DevTestAzureSubscription = "DevTestAzureSubscription";
-        public const string StandardAzureSubscription = "StandardAzureSubscription";
-        public const string AzureReservation = "AzureReservation";
+        public const string Active = "Active";
+        public const string Deleted = "Deleted";
+        public const string Disabled = "Disabled";
+        public const string Expired = "Expired";
+        public const string Transferred = "Transferred";
+        public const string Extended = "Extended";
+        public const string Terminated = "Terminated";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountType.cs
similarity index 88%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerType.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountType.cs
index f3aa34eb08481..39da7284d44c9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerType.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AccountType.cs
@@ -12,9 +12,9 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for CustomerType.
+    /// Defines values for AccountType.
     /// </summary>
-    public static class CustomerType
+    public static class AccountType
     {
         public const string Enterprise = "Enterprise";
         public const string Individual = "Individual";
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AddressDetails.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AddressDetails.cs
index 82031e2a89f46..be2312fb279be 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AddressDetails.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AddressDetails.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.Billing.Models
 {
+    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -29,18 +30,21 @@ public AddressDetails()
         /// <summary>
         /// Initializes a new instance of the AddressDetails class.
         /// </summary>
-        /// <param name="firstName">First Name.</param>
-        /// <param name="lastName">Last Name.</param>
-        /// <param name="companyName">Company Name.</param>
-        /// <param name="addressLine1">Address Line1.</param>
-        /// <param name="addressLine2">Address Line2.</param>
-        /// <param name="addressLine3">Address Line3.</param>
-        /// <param name="city">Address City.</param>
-        /// <param name="region">Address Region.</param>
+        /// <param name="addressLine1">Address line 1.</param>
         /// <param name="country">Country code uses ISO2, 2-digit
         /// format.</param>
-        /// <param name="postalCode">Address Postal Code.</param>
-        public AddressDetails(string firstName = default(string), string lastName = default(string), string companyName = default(string), string addressLine1 = default(string), string addressLine2 = default(string), string addressLine3 = default(string), string city = default(string), string region = default(string), string country = default(string), string postalCode = default(string))
+        /// <param name="firstName">First name.</param>
+        /// <param name="lastName">Last name.</param>
+        /// <param name="companyName">Company name.</param>
+        /// <param name="addressLine2">Address line 2.</param>
+        /// <param name="addressLine3">Address line 3.</param>
+        /// <param name="city">Address city.</param>
+        /// <param name="district">Address district.</param>
+        /// <param name="region">Address region.</param>
+        /// <param name="postalCode">Postal code.</param>
+        /// <param name="email">Email address.</param>
+        /// <param name="phoneNumber">Phone number.</param>
+        public AddressDetails(string addressLine1, string country, string firstName = default(string), string lastName = default(string), string companyName = default(string), string addressLine2 = default(string), string addressLine3 = default(string), string city = default(string), string district = default(string), string region = default(string), string postalCode = default(string), string email = default(string), string phoneNumber = default(string))
         {
             FirstName = firstName;
             LastName = lastName;
@@ -49,9 +53,12 @@ public AddressDetails()
             AddressLine2 = addressLine2;
             AddressLine3 = addressLine3;
             City = city;
+            District = district;
             Region = region;
             Country = country;
             PostalCode = postalCode;
+            Email = email;
+            PhoneNumber = phoneNumber;
             CustomInit();
         }
 
@@ -61,49 +68,55 @@ public AddressDetails()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets first Name.
+        /// Gets or sets first name.
         /// </summary>
         [JsonProperty(PropertyName = "firstName")]
         public string FirstName { get; set; }
 
         /// <summary>
-        /// Gets or sets last Name.
+        /// Gets or sets last name.
         /// </summary>
         [JsonProperty(PropertyName = "lastName")]
         public string LastName { get; set; }
 
         /// <summary>
-        /// Gets or sets company Name.
+        /// Gets or sets company name.
         /// </summary>
         [JsonProperty(PropertyName = "companyName")]
         public string CompanyName { get; set; }
 
         /// <summary>
-        /// Gets or sets address Line1.
+        /// Gets or sets address line 1.
         /// </summary>
         [JsonProperty(PropertyName = "addressLine1")]
         public string AddressLine1 { get; set; }
 
         /// <summary>
-        /// Gets or sets address Line2.
+        /// Gets or sets address line 2.
         /// </summary>
         [JsonProperty(PropertyName = "addressLine2")]
         public string AddressLine2 { get; set; }
 
         /// <summary>
-        /// Gets or sets address Line3.
+        /// Gets or sets address line 3.
         /// </summary>
         [JsonProperty(PropertyName = "addressLine3")]
         public string AddressLine3 { get; set; }
 
         /// <summary>
-        /// Gets or sets address City.
+        /// Gets or sets address city.
         /// </summary>
         [JsonProperty(PropertyName = "city")]
         public string City { get; set; }
 
         /// <summary>
-        /// Gets or sets address Region.
+        /// Gets or sets address district.
+        /// </summary>
+        [JsonProperty(PropertyName = "district")]
+        public string District { get; set; }
+
+        /// <summary>
+        /// Gets or sets address region.
         /// </summary>
         [JsonProperty(PropertyName = "region")]
         public string Region { get; set; }
@@ -115,10 +128,39 @@ public AddressDetails()
         public string Country { get; set; }
 
         /// <summary>
-        /// Gets or sets address Postal Code.
+        /// Gets or sets postal code.
         /// </summary>
         [JsonProperty(PropertyName = "postalCode")]
         public string PostalCode { get; set; }
 
+        /// <summary>
+        /// Gets or sets email address.
+        /// </summary>
+        [JsonProperty(PropertyName = "email")]
+        public string Email { get; set; }
+
+        /// <summary>
+        /// Gets or sets phone number.
+        /// </summary>
+        [JsonProperty(PropertyName = "phoneNumber")]
+        public string PhoneNumber { get; set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (AddressLine1 == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "AddressLine1");
+            }
+            if (Country == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "Country");
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Agreement.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Agreement.cs
index f34d3e86093b3..ef8b3b47aa74c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Agreement.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Agreement.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// An agreement resource.
+    /// An agreement.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Agreement : Resource
@@ -37,16 +37,27 @@ public Agreement()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="agreementLink">The link to the agreement.</param>
-        /// <param name="effectiveDate">Effective date.</param>
-        /// <param name="expirationDate">Expiration date.</param>
-        /// <param name="participants">Participants or signer of the
+        /// <param name="agreementLink">The URL to download the
         /// agreement.</param>
-        /// <param name="status">The agreement status</param>
-        public Agreement(string id = default(string), string name = default(string), string type = default(string), string agreementLink = default(string), System.DateTime? effectiveDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), IList<Participants> participants = default(IList<Participants>), string status = default(string))
+        /// <param name="category">The category of the agreement signed by a
+        /// customer. Possible values include: 'MicrosoftCustomerAgreement',
+        /// 'AffiliatePurchaseTerms', 'Other'</param>
+        /// <param name="acceptanceMode">The mode of acceptance for an
+        /// agreement. Possible values include: 'ClickToAccept',
+        /// 'ESignEmbedded', 'ESignOffline'</param>
+        /// <param name="effectiveDate">The date from which the agreement is
+        /// effective.</param>
+        /// <param name="expirationDate">The date when the agreement
+        /// expires.</param>
+        /// <param name="participants">The list of participants that
+        /// participates in acceptance of an agreement.</param>
+        /// <param name="status">The current status of the agreement.</param>
+        public Agreement(string id = default(string), string name = default(string), string type = default(string), string agreementLink = default(string), string category = default(string), string acceptanceMode = default(string), System.DateTime? effectiveDate = default(System.DateTime?), System.DateTime? expirationDate = default(System.DateTime?), IList<Participants> participants = default(IList<Participants>), string status = default(string))
             : base(id, name, type)
         {
             AgreementLink = agreementLink;
+            Category = category;
+            AcceptanceMode = acceptanceMode;
             EffectiveDate = effectiveDate;
             ExpirationDate = expirationDate;
             Participants = participants;
@@ -60,31 +71,47 @@ public Agreement()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the link to the agreement.
+        /// Gets the URL to download the agreement.
         /// </summary>
         [JsonProperty(PropertyName = "properties.agreementLink")]
         public string AgreementLink { get; private set; }
 
         /// <summary>
-        /// Gets effective date.
+        /// Gets the category of the agreement signed by a customer. Possible
+        /// values include: 'MicrosoftCustomerAgreement',
+        /// 'AffiliatePurchaseTerms', 'Other'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.category")]
+        public string Category { get; private set; }
+
+        /// <summary>
+        /// Gets the mode of acceptance for an agreement. Possible values
+        /// include: 'ClickToAccept', 'ESignEmbedded', 'ESignOffline'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.acceptanceMode")]
+        public string AcceptanceMode { get; private set; }
+
+        /// <summary>
+        /// Gets the date from which the agreement is effective.
         /// </summary>
         [JsonProperty(PropertyName = "properties.effectiveDate")]
         public System.DateTime? EffectiveDate { get; private set; }
 
         /// <summary>
-        /// Gets expiration date.
+        /// Gets the date when the agreement expires.
         /// </summary>
         [JsonProperty(PropertyName = "properties.expirationDate")]
         public System.DateTime? ExpirationDate { get; private set; }
 
         /// <summary>
-        /// Gets or sets participants or signer of the agreement.
+        /// Gets or sets the list of participants that participates in
+        /// acceptance of an agreement.
         /// </summary>
         [JsonProperty(PropertyName = "properties.participants")]
         public IList<Participants> Participants { get; set; }
 
         /// <summary>
-        /// Gets the agreement status
+        /// Gets the current status of the agreement.
         /// </summary>
         [JsonProperty(PropertyName = "properties.status")]
         public string Status { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AgreementListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AgreementListResult.cs
deleted file mode 100644
index a4ed77194a42b..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AgreementListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing agreements.
-    /// </summary>
-    public partial class AgreementListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the AgreementListResult class.
-        /// </summary>
-        public AgreementListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the AgreementListResult class.
-        /// </summary>
-        /// <param name="value">The list of agreements.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public AgreementListResult(IList<Agreement> value = default(IList<Agreement>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of agreements.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<Agreement> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Amount.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Amount.cs
index c82d4c302b306..9dde6d59e2804 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Amount.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Amount.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The Amount.
+    /// The amount.
     /// </summary>
     public partial class Amount
     {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Status.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AutoRenew.cs
similarity index 73%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Status.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AutoRenew.cs
index c0910b8037339..34af34329611b 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Status.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AutoRenew.cs
@@ -12,11 +12,11 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for Status.
+    /// Defines values for AutoRenew.
     /// </summary>
-    public static class Status
+    public static class AutoRenew
     {
-        public const string Approved = "Approved";
-        public const string Rejected = "Rejected";
+        public const string Off = "Off";
+        public const string On = "On";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AvailableBalance.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AvailableBalance.cs
index a581f7ff97796..b2955e2d9d1ae 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AvailableBalance.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AvailableBalance.cs
@@ -16,7 +16,8 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Latest available balance on Monetary Credit PI.
+    /// The latest Azure credit balance. This is the balance available for pay
+    /// now.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class AvailableBalance : Resource
@@ -35,7 +36,7 @@ public AvailableBalance()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="amount">Balance Amount.</param>
+        /// <param name="amount">Balance amount.</param>
         public AvailableBalance(string id = default(string), string name = default(string), string type = default(string), Amount amount = default(Amount))
             : base(id, name, type)
         {
@@ -49,7 +50,7 @@ public AvailableBalance()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets balance Amount.
+        /// Gets balance amount.
         /// </summary>
         [JsonProperty(PropertyName = "properties.amount")]
         public Amount Amount { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AzurePlan.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AzurePlan.cs
index 0c6c4ae3a058b..3e89d33d93e9d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AzurePlan.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/AzurePlan.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Details about the azure plan.
+    /// Details of the Azure plan.
     /// </summary>
     public partial class AzurePlan
     {
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccount.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccount.cs
index 633f0f3bdbe27..d6f75c453bd23 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccount.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccount.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A billing account resource.
+    /// A billing account.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingAccount : Resource
@@ -38,15 +38,18 @@ public BillingAccount()
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
         /// <param name="displayName">The billing account name.</param>
-        /// <param name="address">The address associated with billing
-        /// account.</param>
+        /// <param name="soldTo">The address of the individual or organization
+        /// that is responsible for the billing account.</param>
         /// <param name="agreementType">The type of agreement. Possible values
         /// include: 'MicrosoftCustomerAgreement', 'EnterpriseAgreement',
         /// 'MicrosoftOnlineServicesProgram',
         /// 'MicrosoftPartnerAgreement'</param>
-        /// <param name="customerType">The type of customer. Possible values
+        /// <param name="accountType">The type of customer. Possible values
         /// include: 'Enterprise', 'Individual', 'Partner'</param>
-        /// <param name="billingProfiles">The billing profiles associated to
+        /// <param name="accountStatus">The current status of the billing
+        /// account. Possible values include: 'Active', 'Deleted', 'Disabled',
+        /// 'Expired', 'Transferred', 'Extended', 'Terminated'</param>
+        /// <param name="billingProfiles">The billing profiles associated with
         /// the billing account. By default this is not populated, unless it's
         /// specified in $expand.</param>
         /// <param name="enrollmentDetails">The details about the associated
@@ -56,19 +59,21 @@ public BillingAccount()
         /// enrollment.</param>
         /// <param name="enrollmentAccounts">The accounts associated to the
         /// enrollment.</param>
-        /// <param name="organizationId">Organization id.</param>
-        public BillingAccount(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), AddressDetails address = default(AddressDetails), string agreementType = default(string), string customerType = default(string), IList<BillingProfile> billingProfiles = default(IList<BillingProfile>), Enrollment enrollmentDetails = default(Enrollment), IList<Department> departments = default(IList<Department>), IList<EnrollmentAccount> enrollmentAccounts = default(IList<EnrollmentAccount>), string organizationId = default(string))
+        /// <param name="hasReadAccess">Indicates whether user has read access
+        /// to the billing account.</param>
+        public BillingAccount(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), AddressDetails soldTo = default(AddressDetails), string agreementType = default(string), string accountType = default(string), string accountStatus = default(string), BillingProfilesOnExpand billingProfiles = default(BillingProfilesOnExpand), Enrollment enrollmentDetails = default(Enrollment), IList<Department> departments = default(IList<Department>), IList<EnrollmentAccount> enrollmentAccounts = default(IList<EnrollmentAccount>), bool? hasReadAccess = default(bool?))
             : base(id, name, type)
         {
             DisplayName = displayName;
-            Address = address;
+            SoldTo = soldTo;
             AgreementType = agreementType;
-            CustomerType = customerType;
+            AccountType = accountType;
+            AccountStatus = accountStatus;
             BillingProfiles = billingProfiles;
             EnrollmentDetails = enrollmentDetails;
             Departments = departments;
             EnrollmentAccounts = enrollmentAccounts;
-            OrganizationId = organizationId;
+            HasReadAccess = hasReadAccess;
             CustomInit();
         }
 
@@ -78,16 +83,17 @@ public BillingAccount()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the billing account name.
+        /// Gets or sets the billing account name.
         /// </summary>
         [JsonProperty(PropertyName = "properties.displayName")]
-        public string DisplayName { get; private set; }
+        public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets the address associated with billing account.
+        /// Gets or sets the address of the individual or organization that is
+        /// responsible for the billing account.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.address")]
-        public AddressDetails Address { get; set; }
+        [JsonProperty(PropertyName = "properties.soldTo")]
+        public AddressDetails SoldTo { get; set; }
 
         /// <summary>
         /// Gets the type of agreement. Possible values include:
@@ -101,16 +107,24 @@ public BillingAccount()
         /// Gets the type of customer. Possible values include: 'Enterprise',
         /// 'Individual', 'Partner'
         /// </summary>
-        [JsonProperty(PropertyName = "properties.customerType")]
-        public string CustomerType { get; private set; }
+        [JsonProperty(PropertyName = "properties.accountType")]
+        public string AccountType { get; private set; }
 
         /// <summary>
-        /// Gets or sets the billing profiles associated to the billing
+        /// Gets the current status of the billing account. Possible values
+        /// include: 'Active', 'Deleted', 'Disabled', 'Expired', 'Transferred',
+        /// 'Extended', 'Terminated'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.accountStatus")]
+        public string AccountStatus { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the billing profiles associated with the billing
         /// account. By default this is not populated, unless it's specified in
         /// $expand.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfiles")]
-        public IList<BillingProfile> BillingProfiles { get; set; }
+        public BillingProfilesOnExpand BillingProfiles { get; set; }
 
         /// <summary>
         /// Gets the details about the associated legacy enrollment. By default
@@ -132,10 +146,23 @@ public BillingAccount()
         public IList<EnrollmentAccount> EnrollmentAccounts { get; set; }
 
         /// <summary>
-        /// Gets organization id.
+        /// Gets indicates whether user has read access to the billing account.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.organizationId")]
-        public string OrganizationId { get; private set; }
+        [JsonProperty(PropertyName = "properties.hasReadAccess")]
+        public bool? HasReadAccess { get; private set; }
 
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (SoldTo != null)
+            {
+                SoldTo.Validate();
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountListResult.cs
deleted file mode 100644
index 5cc14b8c31a10..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing billing accounts.
-    /// </summary>
-    public partial class BillingAccountListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingAccountListResult class.
-        /// </summary>
-        public BillingAccountListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingAccountListResult class.
-        /// </summary>
-        /// <param name="value">The list of billing accounts.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public BillingAccountListResult(IList<BillingAccount> value = default(IList<BillingAccount>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of billing accounts.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingAccount> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountUpdateRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountUpdateRequest.cs
index 473ad4d5ad98c..597cbbfc8e58e 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountUpdateRequest.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingAccountUpdateRequest.cs
@@ -37,15 +37,18 @@ public BillingAccountUpdateRequest()
         /// class.
         /// </summary>
         /// <param name="displayName">The billing account name.</param>
-        /// <param name="address">The address associated with billing
-        /// account.</param>
+        /// <param name="soldTo">The address of the individual or organization
+        /// that is responsible for the billing account.</param>
         /// <param name="agreementType">The type of agreement. Possible values
         /// include: 'MicrosoftCustomerAgreement', 'EnterpriseAgreement',
         /// 'MicrosoftOnlineServicesProgram',
         /// 'MicrosoftPartnerAgreement'</param>
-        /// <param name="customerType">The type of customer. Possible values
+        /// <param name="accountType">The type of customer. Possible values
         /// include: 'Enterprise', 'Individual', 'Partner'</param>
-        /// <param name="billingProfiles">The billing profiles associated to
+        /// <param name="accountStatus">The current status of the billing
+        /// account. Possible values include: 'Active', 'Deleted', 'Disabled',
+        /// 'Expired', 'Transferred', 'Extended', 'Terminated'</param>
+        /// <param name="billingProfiles">The billing profiles associated with
         /// the billing account. By default this is not populated, unless it's
         /// specified in $expand.</param>
         /// <param name="enrollmentDetails">The details about the associated
@@ -55,18 +58,20 @@ public BillingAccountUpdateRequest()
         /// enrollment.</param>
         /// <param name="enrollmentAccounts">The accounts associated to the
         /// enrollment.</param>
-        /// <param name="organizationId">Organization id.</param>
-        public BillingAccountUpdateRequest(string displayName = default(string), AddressDetails address = default(AddressDetails), string agreementType = default(string), string customerType = default(string), IList<BillingProfile> billingProfiles = default(IList<BillingProfile>), Enrollment enrollmentDetails = default(Enrollment), IList<Department> departments = default(IList<Department>), IList<EnrollmentAccount> enrollmentAccounts = default(IList<EnrollmentAccount>), string organizationId = default(string))
+        /// <param name="hasReadAccess">Indicates whether user has read access
+        /// to the billing account.</param>
+        public BillingAccountUpdateRequest(string displayName = default(string), AddressDetails soldTo = default(AddressDetails), string agreementType = default(string), string accountType = default(string), string accountStatus = default(string), BillingProfilesOnExpand billingProfiles = default(BillingProfilesOnExpand), Enrollment enrollmentDetails = default(Enrollment), IList<Department> departments = default(IList<Department>), IList<EnrollmentAccount> enrollmentAccounts = default(IList<EnrollmentAccount>), bool? hasReadAccess = default(bool?))
         {
             DisplayName = displayName;
-            Address = address;
+            SoldTo = soldTo;
             AgreementType = agreementType;
-            CustomerType = customerType;
+            AccountType = accountType;
+            AccountStatus = accountStatus;
             BillingProfiles = billingProfiles;
             EnrollmentDetails = enrollmentDetails;
             Departments = departments;
             EnrollmentAccounts = enrollmentAccounts;
-            OrganizationId = organizationId;
+            HasReadAccess = hasReadAccess;
             CustomInit();
         }
 
@@ -76,16 +81,17 @@ public BillingAccountUpdateRequest()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the billing account name.
+        /// Gets or sets the billing account name.
         /// </summary>
         [JsonProperty(PropertyName = "properties.displayName")]
-        public string DisplayName { get; private set; }
+        public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets the address associated with billing account.
+        /// Gets or sets the address of the individual or organization that is
+        /// responsible for the billing account.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.address")]
-        public AddressDetails Address { get; set; }
+        [JsonProperty(PropertyName = "properties.soldTo")]
+        public AddressDetails SoldTo { get; set; }
 
         /// <summary>
         /// Gets the type of agreement. Possible values include:
@@ -99,16 +105,24 @@ public BillingAccountUpdateRequest()
         /// Gets the type of customer. Possible values include: 'Enterprise',
         /// 'Individual', 'Partner'
         /// </summary>
-        [JsonProperty(PropertyName = "properties.customerType")]
-        public string CustomerType { get; private set; }
+        [JsonProperty(PropertyName = "properties.accountType")]
+        public string AccountType { get; private set; }
 
         /// <summary>
-        /// Gets or sets the billing profiles associated to the billing
+        /// Gets the current status of the billing account. Possible values
+        /// include: 'Active', 'Deleted', 'Disabled', 'Expired', 'Transferred',
+        /// 'Extended', 'Terminated'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.accountStatus")]
+        public string AccountStatus { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the billing profiles associated with the billing
         /// account. By default this is not populated, unless it's specified in
         /// $expand.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfiles")]
-        public IList<BillingProfile> BillingProfiles { get; set; }
+        public BillingProfilesOnExpand BillingProfiles { get; set; }
 
         /// <summary>
         /// Gets the details about the associated legacy enrollment. By default
@@ -130,10 +144,23 @@ public BillingAccountUpdateRequest()
         public IList<EnrollmentAccount> EnrollmentAccounts { get; set; }
 
         /// <summary>
-        /// Gets organization id.
+        /// Gets indicates whether user has read access to the billing account.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.organizationId")]
-        public string OrganizationId { get; private set; }
+        [JsonProperty(PropertyName = "properties.hasReadAccess")]
+        public bool? HasReadAccess { get; private set; }
 
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (SoldTo != null)
+            {
+                SoldTo.Validate();
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsListResult.cs
deleted file mode 100644
index a1408e2c73730..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsListResult.cs
+++ /dev/null
@@ -1,57 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of list billingPermissions a caller has on a billing account.
-    /// </summary>
-    public partial class BillingPermissionsListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingPermissionsListResult
-        /// class.
-        /// </summary>
-        public BillingPermissionsListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingPermissionsListResult
-        /// class.
-        /// </summary>
-        /// <param name="value">The list of billingPermissions a caller has on
-        /// a billing account.</param>
-        public BillingPermissionsListResult(IList<BillingPermissionsProperties> value = default(IList<BillingPermissionsProperties>))
-        {
-            Value = value;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of billingPermissions a caller has on a billing
-        /// account.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingPermissionsProperties> Value { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsProperties.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsProperties.cs
index ecc35db60d467..4a5ad7ec7b9c9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsProperties.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingPermissionsProperties.cs
@@ -35,9 +35,9 @@ public BillingPermissionsProperties()
         /// class.
         /// </summary>
         /// <param name="actions">The set of actions that the caller is allowed
-        /// to do</param>
-        /// <param name="notActions">The set of actions the caller is not
-        /// allowed to do</param>
+        /// to perform.</param>
+        /// <param name="notActions">The set of actions that the caller is not
+        /// allowed to perform.</param>
         public BillingPermissionsProperties(IList<string> actions = default(IList<string>), IList<string> notActions = default(IList<string>))
         {
             Actions = actions;
@@ -51,13 +51,13 @@ public BillingPermissionsProperties()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the set of actions that the caller is allowed to do
+        /// Gets the set of actions that the caller is allowed to perform.
         /// </summary>
         [JsonProperty(PropertyName = "actions")]
         public IList<string> Actions { get; private set; }
 
         /// <summary>
-        /// Gets the set of actions the caller is not allowed to do
+        /// Gets the set of actions that the caller is not allowed to perform.
         /// </summary>
         [JsonProperty(PropertyName = "notActions")]
         public IList<string> NotActions { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfile.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfile.cs
index dca0b5439273e..35a438a6a3d64 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfile.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfile.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A billing profile resource.
+    /// A billing profile.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingProfile : Resource
@@ -37,29 +37,48 @@ public BillingProfile()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="displayName">The billing profile name.</param>
-        /// <param name="poNumber">Purchase order number.</param>
-        /// <param name="address">Billing address.</param>
-        /// <param name="invoiceEmailOptIn">If the billing profile is opted in
-        /// to receive invoices via email.</param>
-        /// <param name="invoiceDay">Invoice day.</param>
-        /// <param name="currency">The currency associated with the billing
-        /// profile.</param>
+        /// <param name="displayName">The name of the billing profile.</param>
+        /// <param name="poNumber">The purchase order name that will appear on
+        /// the invoices generated for the billing profile.</param>
+        /// <param name="billTo">Billing address.</param>
+        /// <param name="invoiceEmailOptIn">Flag controlling whether the
+        /// invoices for the billing profile are sent through email.</param>
+        /// <param name="invoiceDay">The day of the month when the invoice for
+        /// the billing profile is generated.</param>
+        /// <param name="currency">The currency in which the charges for the
+        /// billing profile are billed.</param>
         /// <param name="enabledAzurePlans">Information about the enabled azure
         /// plans.</param>
         /// <param name="invoiceSections">The invoice sections associated to
-        /// the billing profile.</param>
-        public BillingProfile(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), string poNumber = default(string), AddressDetails address = default(AddressDetails), bool? invoiceEmailOptIn = default(bool?), int? invoiceDay = default(int?), string currency = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>), IList<InvoiceSection> invoiceSections = default(IList<InvoiceSection>))
+        /// the billing profile. By default this is not populated, unless it's
+        /// specified in $expand.</param>
+        /// <param name="hasReadAccess">Indicates whether user has read access
+        /// to the billing profile.</param>
+        /// <param name="systemId">The system generated unique identifier for a
+        /// billing profile.</param>
+        /// <param name="status">The status of the billing profile. Possible
+        /// values include: 'Active', 'Disabled', 'Warned'</param>
+        /// <param name="statusReasonCode">Reason for the specified billing
+        /// profile status. Possible values include: 'PastDue',
+        /// 'SpendingLimitReached', 'SpendingLimitExpired'</param>
+        /// <param name="spendingLimit">The billing profile spending limit.
+        /// Possible values include: 'Off', 'On'</param>
+        public BillingProfile(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), string poNumber = default(string), AddressDetails billTo = default(AddressDetails), bool? invoiceEmailOptIn = default(bool?), int? invoiceDay = default(int?), string currency = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>), InvoiceSectionsOnExpand invoiceSections = default(InvoiceSectionsOnExpand), bool? hasReadAccess = default(bool?), string systemId = default(string), string status = default(string), string statusReasonCode = default(string), string spendingLimit = default(string))
             : base(id, name, type)
         {
             DisplayName = displayName;
             PoNumber = poNumber;
-            Address = address;
+            BillTo = billTo;
             InvoiceEmailOptIn = invoiceEmailOptIn;
             InvoiceDay = invoiceDay;
             Currency = currency;
             EnabledAzurePlans = enabledAzurePlans;
             InvoiceSections = invoiceSections;
+            HasReadAccess = hasReadAccess;
+            SystemId = systemId;
+            Status = status;
+            StatusReasonCode = statusReasonCode;
+            SpendingLimit = spendingLimit;
             CustomInit();
         }
 
@@ -69,13 +88,14 @@ public BillingProfile()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the billing profile name.
+        /// Gets or sets the name of the billing profile.
         /// </summary>
         [JsonProperty(PropertyName = "properties.displayName")]
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets purchase order number.
+        /// Gets or sets the purchase order name that will appear on the
+        /// invoices generated for the billing profile.
         /// </summary>
         [JsonProperty(PropertyName = "properties.poNumber")]
         public string PoNumber { get; set; }
@@ -83,24 +103,26 @@ public BillingProfile()
         /// <summary>
         /// Gets or sets billing address.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.address")]
-        public AddressDetails Address { get; set; }
+        [JsonProperty(PropertyName = "properties.billTo")]
+        public AddressDetails BillTo { get; set; }
 
         /// <summary>
-        /// Gets or sets if the billing profile is opted in to receive invoices
-        /// via email.
+        /// Gets or sets flag controlling whether the invoices for the billing
+        /// profile are sent through email.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceEmailOptIn")]
         public bool? InvoiceEmailOptIn { get; set; }
 
         /// <summary>
-        /// Gets invoice day.
+        /// Gets the day of the month when the invoice for the billing profile
+        /// is generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceDay")]
         public int? InvoiceDay { get; private set; }
 
         /// <summary>
-        /// Gets the currency associated with the billing profile.
+        /// Gets the currency in which the charges for the billing profile are
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.currency")]
         public string Currency { get; private set; }
@@ -113,10 +135,58 @@ public BillingProfile()
 
         /// <summary>
         /// Gets or sets the invoice sections associated to the billing
-        /// profile.
+        /// profile. By default this is not populated, unless it's specified in
+        /// $expand.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSections")]
-        public IList<InvoiceSection> InvoiceSections { get; set; }
+        public InvoiceSectionsOnExpand InvoiceSections { get; set; }
 
+        /// <summary>
+        /// Gets indicates whether user has read access to the billing profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.hasReadAccess")]
+        public bool? HasReadAccess { get; private set; }
+
+        /// <summary>
+        /// Gets the system generated unique identifier for a billing profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.systemId")]
+        public string SystemId { get; private set; }
+
+        /// <summary>
+        /// Gets the status of the billing profile. Possible values include:
+        /// 'Active', 'Disabled', 'Warned'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.status")]
+        public string Status { get; private set; }
+
+        /// <summary>
+        /// Gets reason for the specified billing profile status. Possible
+        /// values include: 'PastDue', 'SpendingLimitReached',
+        /// 'SpendingLimitExpired'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.statusReasonCode")]
+        public string StatusReasonCode { get; private set; }
+
+        /// <summary>
+        /// Gets the billing profile spending limit. Possible values include:
+        /// 'Off', 'On'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.spendingLimit")]
+        public string SpendingLimit { get; private set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (BillTo != null)
+            {
+                BillTo.Validate();
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileCreationRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileCreationRequest.cs
index 3286aade23363..c3fb140c6d404 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileCreationRequest.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileCreationRequest.cs
@@ -33,18 +33,20 @@ public BillingProfileCreationRequest()
         /// Initializes a new instance of the BillingProfileCreationRequest
         /// class.
         /// </summary>
-        /// <param name="displayName">The billing profile name.</param>
-        /// <param name="poNumber">Purchase order number.</param>
-        /// <param name="address">Billing address.</param>
-        /// <param name="invoiceEmailOptIn">If the billing profile is opted in
-        /// to receive invoices via email.</param>
-        /// <param name="enabledAzurePlans">Enabled azure plans for this
-        /// billing profile.</param>
-        public BillingProfileCreationRequest(string displayName = default(string), string poNumber = default(string), AddressDetails address = default(AddressDetails), bool? invoiceEmailOptIn = default(bool?), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>))
+        /// <param name="displayName">The name of the billing profile.</param>
+        /// <param name="poNumber">The purchase order name that will appear on
+        /// the invoices generated for the billing profile.</param>
+        /// <param name="billTo">The address of the individual or organization
+        /// that is responsible for the billing profile.</param>
+        /// <param name="invoiceEmailOptIn">Flag controlling whether the
+        /// invoices for the billing profile are sent through email.</param>
+        /// <param name="enabledAzurePlans">Enabled azure plans for the billing
+        /// profile.</param>
+        public BillingProfileCreationRequest(string displayName = default(string), string poNumber = default(string), AddressDetails billTo = default(AddressDetails), bool? invoiceEmailOptIn = default(bool?), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>))
         {
             DisplayName = displayName;
             PoNumber = poNumber;
-            Address = address;
+            BillTo = billTo;
             InvoiceEmailOptIn = invoiceEmailOptIn;
             EnabledAzurePlans = enabledAzurePlans;
             CustomInit();
@@ -56,35 +58,50 @@ public BillingProfileCreationRequest()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the billing profile name.
+        /// Gets or sets the name of the billing profile.
         /// </summary>
         [JsonProperty(PropertyName = "displayName")]
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets purchase order number.
+        /// Gets or sets the purchase order name that will appear on the
+        /// invoices generated for the billing profile.
         /// </summary>
         [JsonProperty(PropertyName = "poNumber")]
         public string PoNumber { get; set; }
 
         /// <summary>
-        /// Gets or sets billing address.
+        /// Gets or sets the address of the individual or organization that is
+        /// responsible for the billing profile.
         /// </summary>
-        [JsonProperty(PropertyName = "address")]
-        public AddressDetails Address { get; set; }
+        [JsonProperty(PropertyName = "billTo")]
+        public AddressDetails BillTo { get; set; }
 
         /// <summary>
-        /// Gets or sets if the billing profile is opted in to receive invoices
-        /// via email.
+        /// Gets or sets flag controlling whether the invoices for the billing
+        /// profile are sent through email.
         /// </summary>
         [JsonProperty(PropertyName = "invoiceEmailOptIn")]
         public bool? InvoiceEmailOptIn { get; set; }
 
         /// <summary>
-        /// Gets or sets enabled azure plans for this billing profile.
+        /// Gets or sets enabled azure plans for the billing profile.
         /// </summary>
         [JsonProperty(PropertyName = "enabledAzurePlans")]
         public IList<AzurePlan> EnabledAzurePlans { get; set; }
 
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="Rest.ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (BillTo != null)
+            {
+                BillTo.Validate();
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileListResult.cs
deleted file mode 100644
index 95ade353a9e5d..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing billing profiles.
-    /// </summary>
-    public partial class BillingProfileListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingProfileListResult class.
-        /// </summary>
-        public BillingProfileListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingProfileListResult class.
-        /// </summary>
-        /// <param name="value">The list of billing profiles.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public BillingProfileListResult(IList<BillingProfile> value = default(IList<BillingProfile>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of billing profiles.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingProfile> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethodType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileSpendingLimit.cs
similarity index 70%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethodType.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileSpendingLimit.cs
index 65c631cddc272..e4902a4b87d7a 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethodType.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileSpendingLimit.cs
@@ -12,11 +12,11 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for PaymentMethodType.
+    /// Defines values for BillingProfileSpendingLimit.
     /// </summary>
-    public static class PaymentMethodType
+    public static class BillingProfileSpendingLimit
     {
-        public const string Credits = "Credits";
-        public const string ChequeWire = "ChequeWire";
+        public const string Off = "Off";
+        public const string On = "On";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatus.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatus.cs
new file mode 100644
index 0000000000000..673be9a7afecb
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatus.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for BillingProfileStatus.
+    /// </summary>
+    public static class BillingProfileStatus
+    {
+        public const string Active = "Active";
+        public const string Disabled = "Disabled";
+        public const string Warned = "Warned";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductTransferStatus.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatusReasonCode.cs
similarity index 59%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductTransferStatus.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatusReasonCode.cs
index 68aa5ac353d51..40a646bebc076 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductTransferStatus.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfileStatusReasonCode.cs
@@ -12,13 +12,12 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for ProductTransferStatus.
+    /// Defines values for BillingProfileStatusReasonCode.
     /// </summary>
-    public static class ProductTransferStatus
+    public static class BillingProfileStatusReasonCode
     {
-        public const string NotStarted = "NotStarted";
-        public const string InProgress = "InProgress";
-        public const string Completed = "Completed";
-        public const string Failed = "Failed";
+        public const string PastDue = "PastDue";
+        public const string SpendingLimitReached = "SpendingLimitReached";
+        public const string SpendingLimitExpired = "SpendingLimitExpired";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsTransferHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateOrUpdateHeaders.cs
similarity index 62%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsTransferHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateOrUpdateHeaders.cs
index 253d7ba5b08db..d9b7bfb5e74a0 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsTransferHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateOrUpdateHeaders.cs
@@ -14,27 +14,28 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Transfer operation.
+    /// Defines headers for CreateOrUpdate operation.
     /// </summary>
-    public partial class BillingSubscriptionsTransferHeaders
+    public partial class BillingProfilesCreateOrUpdateHeaders
     {
         /// <summary>
         /// Initializes a new instance of the
-        /// BillingSubscriptionsTransferHeaders class.
+        /// BillingProfilesCreateOrUpdateHeaders class.
         /// </summary>
-        public BillingSubscriptionsTransferHeaders()
+        public BillingProfilesCreateOrUpdateHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
         /// Initializes a new instance of the
-        /// BillingSubscriptionsTransferHeaders class.
+        /// BillingProfilesCreateOrUpdateHeaders class.
         /// </summary>
-        /// <param name="location">Location URI to poll for result.</param>
-        /// <param name="retryAfter">Recommends the retryable time after
-        /// receiving this.</param>
-        public BillingSubscriptionsTransferHeaders(string location = default(string), int? retryAfter = default(int?))
+        /// <param name="location">Location URI to poll for result</param>
+        /// <param name="retryAfter">Recommended time to wait before making
+        /// another request to check the status of the operation. The time is
+        /// specified in seconds.</param>
+        public BillingProfilesCreateOrUpdateHeaders(string location = default(string), int? retryAfter = default(int?))
         {
             Location = location;
             RetryAfter = retryAfter;
@@ -47,13 +48,15 @@ public BillingSubscriptionsTransferHeaders()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets location URI to poll for result.
+        /// Gets or sets location URI to poll for result
         /// </summary>
         [JsonProperty(PropertyName = "Location")]
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets recommends the retryable time after receiving this.
+        /// Gets or sets recommended time to wait before making another request
+        /// to check the status of the operation. The time is specified in
+        /// seconds.
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesOnExpand.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesOnExpand.cs
new file mode 100644
index 0000000000000..76c7d5e487156
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesOnExpand.cs
@@ -0,0 +1,70 @@
+// <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.Billing.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// The billing profiles associated with the billing account. By default
+    /// this is not populated, unless it's specified in $expand.
+    /// </summary>
+    public partial class BillingProfilesOnExpand
+    {
+        /// <summary>
+        /// Initializes a new instance of the BillingProfilesOnExpand class.
+        /// </summary>
+        public BillingProfilesOnExpand()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BillingProfilesOnExpand class.
+        /// </summary>
+        /// <param name="hasMoreResults">Indicates whether there are more
+        /// billing profiles than the ones listed in this collection. The
+        /// collection lists a maximum of 50 billing profiles. To get all
+        /// billing profiles, use the list billing profiles API.</param>
+        /// <param name="value">The billing profiles associated with the
+        /// billing account.</param>
+        public BillingProfilesOnExpand(bool? hasMoreResults = default(bool?), IList<BillingProfile> value = default(IList<BillingProfile>))
+        {
+            HasMoreResults = hasMoreResults;
+            Value = value;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets indicates whether there are more billing profiles than the
+        /// ones listed in this collection. The collection lists a maximum of
+        /// 50 billing profiles. To get all billing profiles, use the list
+        /// billing profiles API.
+        /// </summary>
+        [JsonProperty(PropertyName = "hasMoreResults")]
+        public bool? HasMoreResults { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the billing profiles associated with the billing
+        /// account.
+        /// </summary>
+        [JsonProperty(PropertyName = "value")]
+        public IList<BillingProfile> Value { get; set; }
+
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProperty.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProperty.cs
index 088d082429163..1c0f99b421821 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProperty.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProperty.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A billing property resource.
+    /// A billing property.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingProperty : Resource
@@ -35,32 +35,58 @@ public BillingProperty()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="billingTenantId">Billing tenant Id.</param>
-        /// <param name="billingAccountId">Billing account Id.</param>
-        /// <param name="billingAccountDisplayName">Billing account display
-        /// name.</param>
-        /// <param name="billingProfileId">Billing profile Id.</param>
-        /// <param name="billingProfileDisplayName">Billing profile display
-        /// name.</param>
-        /// <param name="costCenter">Cost center name.</param>
-        /// <param name="invoiceSectionId">Invoice Section Id.</param>
-        /// <param name="invoiceSectionDisplayName">Invoice Section display
-        /// name.</param>
-        /// <param name="productId">Product Id.</param>
-        /// <param name="productName">Product name.</param>
-        /// <param name="skuId">SKU Id.</param>
-        /// <param name="skuDescription">SKU description.</param>
-        public BillingProperty(string id = default(string), string name = default(string), string type = default(string), string billingTenantId = default(string), string billingAccountId = default(string), string billingAccountDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string costCenter = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string productId = default(string), string productName = default(string), string skuId = default(string), string skuDescription = default(string))
+        /// <param name="accountAdminNotificationEmailAddress">The email
+        /// address on which the account admin gets all Azure
+        /// notifications.</param>
+        /// <param name="billingTenantId">The Azure AD tenant ID of the billing
+        /// account for the subscription.</param>
+        /// <param name="billingAccountId">The ID of the billing account to
+        /// which the subscription is billed.</param>
+        /// <param name="billingAccountDisplayName">The name of the billing
+        /// account to which the subscription is billed.</param>
+        /// <param name="billingProfileId">The ID of the billing profile to
+        /// which the subscription is billed.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile to which the subscription is billed.</param>
+        /// <param name="billingProfileStatus">The status of the billing
+        /// profile. Possible values include: 'Active', 'Disabled',
+        /// 'Warned'</param>
+        /// <param name="billingProfileStatusReasonCode">Reason for the
+        /// specified billing profile status. Possible values include:
+        /// 'PastDue', 'SpendingLimitReached', 'SpendingLimitExpired'</param>
+        /// <param name="billingProfileSpendingLimit">The billing profile
+        /// spending limit. Possible values include: 'Off', 'On'</param>
+        /// <param name="costCenter">The cost center applied to the
+        /// subscription.</param>
+        /// <param name="invoiceSectionId">The ID of the invoice section to
+        /// which the subscription is billed.</param>
+        /// <param name="invoiceSectionDisplayName">The name of the invoice
+        /// section to which the subscription is billed.</param>
+        /// <param name="isAccountAdmin">Indicates whether user is the account
+        /// admin.</param>
+        /// <param name="productId">The product ID of the Azure plan.</param>
+        /// <param name="productName">The product name of the Azure
+        /// plan.</param>
+        /// <param name="skuId">The sku ID of the Azure plan for the
+        /// subscription.</param>
+        /// <param name="skuDescription">The sku description of the Azure plan
+        /// for the subscription.</param>
+        public BillingProperty(string id = default(string), string name = default(string), string type = default(string), string accountAdminNotificationEmailAddress = default(string), string billingTenantId = default(string), string billingAccountId = default(string), string billingAccountDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string billingProfileStatus = default(string), string billingProfileStatusReasonCode = default(string), string billingProfileSpendingLimit = default(string), string costCenter = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), bool? isAccountAdmin = default(bool?), string productId = default(string), string productName = default(string), string skuId = default(string), string skuDescription = default(string))
             : base(id, name, type)
         {
+            AccountAdminNotificationEmailAddress = accountAdminNotificationEmailAddress;
             BillingTenantId = billingTenantId;
             BillingAccountId = billingAccountId;
             BillingAccountDisplayName = billingAccountDisplayName;
             BillingProfileId = billingProfileId;
             BillingProfileDisplayName = billingProfileDisplayName;
+            BillingProfileStatus = billingProfileStatus;
+            BillingProfileStatusReasonCode = billingProfileStatusReasonCode;
+            BillingProfileSpendingLimit = billingProfileSpendingLimit;
             CostCenter = costCenter;
             InvoiceSectionId = invoiceSectionId;
             InvoiceSectionDisplayName = invoiceSectionDisplayName;
+            IsAccountAdmin = isAccountAdmin;
             ProductId = productId;
             ProductName = productName;
             SkuId = skuId;
@@ -74,73 +100,115 @@ public BillingProperty()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets billing tenant Id.
+        /// Gets the email address on which the account admin gets all Azure
+        /// notifications.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.accountAdminNotificationEmailAddress")]
+        public string AccountAdminNotificationEmailAddress { get; private set; }
+
+        /// <summary>
+        /// Gets the Azure AD tenant ID of the billing account for the
+        /// subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingTenantId")]
         public string BillingTenantId { get; private set; }
 
         /// <summary>
-        /// Gets billing account Id.
+        /// Gets the ID of the billing account to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingAccountId")]
         public string BillingAccountId { get; private set; }
 
         /// <summary>
-        /// Gets billing account display name.
+        /// Gets the name of the billing account to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingAccountDisplayName")]
         public string BillingAccountDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets billing profile Id.
+        /// Gets the ID of the billing profile to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets billing profile display name.
+        /// Gets the name of the billing profile to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets cost center name.
+        /// Gets the status of the billing profile. Possible values include:
+        /// 'Active', 'Disabled', 'Warned'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingProfileStatus")]
+        public string BillingProfileStatus { get; private set; }
+
+        /// <summary>
+        /// Gets reason for the specified billing profile status. Possible
+        /// values include: 'PastDue', 'SpendingLimitReached',
+        /// 'SpendingLimitExpired'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingProfileStatusReasonCode")]
+        public string BillingProfileStatusReasonCode { get; private set; }
+
+        /// <summary>
+        /// Gets the billing profile spending limit. Possible values include:
+        /// 'Off', 'On'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingProfileSpendingLimit")]
+        public string BillingProfileSpendingLimit { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the cost center applied to the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.costCenter")]
-        public string CostCenter { get; private set; }
+        public string CostCenter { get; set; }
 
         /// <summary>
-        /// Gets invoice Section Id.
+        /// Gets the ID of the invoice section to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionId")]
         public string InvoiceSectionId { get; private set; }
 
         /// <summary>
-        /// Gets invoice Section display name.
+        /// Gets the name of the invoice section to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionDisplayName")]
         public string InvoiceSectionDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets product Id.
+        /// Gets indicates whether user is the account admin.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.isAccountAdmin")]
+        public bool? IsAccountAdmin { get; private set; }
+
+        /// <summary>
+        /// Gets the product ID of the Azure plan.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productId")]
         public string ProductId { get; private set; }
 
         /// <summary>
-        /// Gets product name.
+        /// Gets the product name of the Azure plan.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productName")]
         public string ProductName { get; private set; }
 
         /// <summary>
-        /// Gets SKU Id.
+        /// Gets the sku ID of the Azure plan for the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuId")]
         public string SkuId { get; private set; }
 
         /// <summary>
-        /// Gets SKU description.
+        /// Gets the sku description of the Azure plan for the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuDescription")]
         public string SkuDescription { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignment.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignment.cs
index ba6ea2556e281..fa0945df65406 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignment.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignment.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// a role assignment
+    /// The role assignment
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingRoleAssignment : Resource
@@ -35,28 +35,39 @@ public BillingRoleAssignment()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="createdOn">the date the role assignment is
-        /// created</param>
-        /// <param name="createdByPrincipalTenantId">the creator's tenant
-        /// Id</param>
-        /// <param name="createdByPrincipalId">the creator's principal
-        /// Id</param>
-        /// <param name="billingRoleAssignmentName">the name of the role
-        /// assignment</param>
-        /// <param name="principalId">The user's principal id that the role
-        /// gets assigned to</param>
-        /// <param name="roleDefinitionName">The role definition id</param>
-        /// <param name="scope">The scope the role get assigned to</param>
-        public BillingRoleAssignment(string id = default(string), string name = default(string), string type = default(string), string createdOn = default(string), string createdByPrincipalTenantId = default(string), string createdByPrincipalId = default(string), string billingRoleAssignmentName = default(string), string principalId = default(string), string roleDefinitionName = default(string), string scope = default(string))
+        /// <param name="createdOn">The date the role assignment was
+        /// created.</param>
+        /// <param name="createdByPrincipalTenantId">The tenant Id of the user
+        /// who created the role assignment.</param>
+        /// <param name="createdByPrincipalId">The principal Id of the user who
+        /// created the role assignment.</param>
+        /// <param name="createdByUserEmailAddress">The email address of the
+        /// user who created the role assignment.</param>
+        /// <param name="principalId">The principal id of the user to whom the
+        /// role was assigned.</param>
+        /// <param name="principalTenantId">The principal tenant id of the user
+        /// to whom the role was assigned.</param>
+        /// <param name="roleDefinitionId">The ID of the role
+        /// definition.</param>
+        /// <param name="scope">The scope at which the role was
+        /// assigned.</param>
+        /// <param name="userAuthenticationType">The authentication
+        /// type.</param>
+        /// <param name="userEmailAddress">The email address of the
+        /// user.</param>
+        public BillingRoleAssignment(string id = default(string), string name = default(string), string type = default(string), string createdOn = default(string), string createdByPrincipalTenantId = default(string), string createdByPrincipalId = default(string), string createdByUserEmailAddress = default(string), string principalId = default(string), string principalTenantId = default(string), string roleDefinitionId = default(string), string scope = default(string), string userAuthenticationType = default(string), string userEmailAddress = default(string))
             : base(id, name, type)
         {
             CreatedOn = createdOn;
             CreatedByPrincipalTenantId = createdByPrincipalTenantId;
             CreatedByPrincipalId = createdByPrincipalId;
-            BillingRoleAssignmentName = billingRoleAssignmentName;
+            CreatedByUserEmailAddress = createdByUserEmailAddress;
             PrincipalId = principalId;
-            RoleDefinitionName = roleDefinitionName;
+            PrincipalTenantId = principalTenantId;
+            RoleDefinitionId = roleDefinitionId;
             Scope = scope;
+            UserAuthenticationType = userAuthenticationType;
+            UserEmailAddress = userEmailAddress;
             CustomInit();
         }
 
@@ -66,46 +77,65 @@ public BillingRoleAssignment()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the date the role assignment is created
+        /// Gets the date the role assignment was created.
         /// </summary>
         [JsonProperty(PropertyName = "properties.createdOn")]
         public string CreatedOn { get; private set; }
 
         /// <summary>
-        /// Gets the creator's tenant Id
+        /// Gets the tenant Id of the user who created the role assignment.
         /// </summary>
         [JsonProperty(PropertyName = "properties.createdByPrincipalTenantId")]
         public string CreatedByPrincipalTenantId { get; private set; }
 
         /// <summary>
-        /// Gets the creator's principal Id
+        /// Gets the principal Id of the user who created the role assignment.
         /// </summary>
         [JsonProperty(PropertyName = "properties.createdByPrincipalId")]
         public string CreatedByPrincipalId { get; private set; }
 
         /// <summary>
-        /// Gets the name of the role assignment
+        /// Gets the email address of the user who created the role assignment.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.name")]
-        public string BillingRoleAssignmentName { get; private set; }
+        [JsonProperty(PropertyName = "properties.createdByUserEmailAddress")]
+        public string CreatedByUserEmailAddress { get; private set; }
 
         /// <summary>
-        /// Gets the user's principal id that the role gets assigned to
+        /// Gets the principal id of the user to whom the role was assigned.
         /// </summary>
         [JsonProperty(PropertyName = "properties.principalId")]
         public string PrincipalId { get; private set; }
 
         /// <summary>
-        /// Gets the role definition id
+        /// Gets the principal tenant id of the user to whom the role was
+        /// assigned.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.roleDefinitionName")]
-        public string RoleDefinitionName { get; private set; }
+        [JsonProperty(PropertyName = "properties.principalTenantId")]
+        public string PrincipalTenantId { get; private set; }
 
         /// <summary>
-        /// Gets the scope the role get assigned to
+        /// Gets the ID of the role definition.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.roleDefinitionId")]
+        public string RoleDefinitionId { get; private set; }
+
+        /// <summary>
+        /// Gets the scope at which the role was assigned.
         /// </summary>
         [JsonProperty(PropertyName = "properties.scope")]
         public string Scope { get; private set; }
 
+        /// <summary>
+        /// Gets the authentication type.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.userAuthenticationType")]
+        public string UserAuthenticationType { get; private set; }
+
+        /// <summary>
+        /// Gets the email address of the user.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.userEmailAddress")]
+        public string UserEmailAddress { get; private set; }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentListResult.cs
deleted file mode 100644
index ed3d64dc487c1..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentListResult.cs
+++ /dev/null
@@ -1,55 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of get list of role assignments
-    /// </summary>
-    public partial class BillingRoleAssignmentListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleAssignmentListResult
-        /// class.
-        /// </summary>
-        public BillingRoleAssignmentListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleAssignmentListResult
-        /// class.
-        /// </summary>
-        /// <param name="value">The list role assignments</param>
-        public BillingRoleAssignmentListResult(IList<BillingRoleAssignment> value = default(IList<BillingRoleAssignment>))
-        {
-            Value = value;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list role assignments
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingRoleAssignment> Value { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentPayload.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentPayload.cs
deleted file mode 100644
index 74d64a4af330a..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleAssignmentPayload.cs
+++ /dev/null
@@ -1,63 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// The payload use to update role assignment on a scope
-    /// </summary>
-    public partial class BillingRoleAssignmentPayload
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleAssignmentPayload
-        /// class.
-        /// </summary>
-        public BillingRoleAssignmentPayload()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleAssignmentPayload
-        /// class.
-        /// </summary>
-        /// <param name="principalId">The user's principal id that the role
-        /// gets assigned to</param>
-        /// <param name="billingRoleDefinitionId">The role definition
-        /// id</param>
-        public BillingRoleAssignmentPayload(string principalId = default(string), string billingRoleDefinitionId = default(string))
-        {
-            PrincipalId = principalId;
-            BillingRoleDefinitionId = billingRoleDefinitionId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the user's principal id that the role gets assigned to
-        /// </summary>
-        [JsonProperty(PropertyName = "principalId")]
-        public string PrincipalId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the role definition id
-        /// </summary>
-        [JsonProperty(PropertyName = "billingRoleDefinitionId")]
-        public string BillingRoleDefinitionId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinition.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinition.cs
index f1264bd4af446..53748e93e72ad 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinition.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinition.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Result of get role definition for a role.
+    /// The properties of a role definition.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingRoleDefinition : Resource
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinitionListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinitionListResult.cs
deleted file mode 100644
index e2cc802f86d14..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingRoleDefinitionListResult.cs
+++ /dev/null
@@ -1,55 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// list the role definitions.
-    /// </summary>
-    public partial class BillingRoleDefinitionListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleDefinitionListResult
-        /// class.
-        /// </summary>
-        public BillingRoleDefinitionListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingRoleDefinitionListResult
-        /// class.
-        /// </summary>
-        /// <param name="value">The list of role definitions.</param>
-        public BillingRoleDefinitionListResult(IList<BillingRoleDefinition> value = default(IList<BillingRoleDefinition>))
-        {
-            Value = value;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of role definitions.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingRoleDefinition> Value { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscription.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscription.cs
index 0d8e1dc1a2cc6..e6b5472658b7c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscription.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscription.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A billing Subscription resource.
+    /// A billing subscription.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class BillingSubscription : Resource
@@ -35,29 +35,36 @@ public BillingSubscription()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="displayName">display name.</param>
-        /// <param name="subscriptionId">Subscription Id.</param>
-        /// <param name="subscriptionBillingStatus">Subscription billing
-        /// status. Possible values include: 'Active', 'Inactive', 'Abandoned',
-        /// 'Deleted', 'Warning'</param>
-        /// <param name="lastMonthCharges">Last month charges.</param>
-        /// <param name="monthToDateCharges">Month to date charges.</param>
-        /// <param name="billingProfileId">Billing Profile id to which this
-        /// product belongs.</param>
-        /// <param name="billingProfileDisplayName">Billing Profile display
-        /// name to which this product belongs.</param>
-        /// <param name="customerId">Customer id to which this product
-        /// belongs.</param>
-        /// <param name="customerDisplayName">Display name of customer to which
-        /// this product belongs.</param>
-        /// <param name="invoiceSectionId">Invoice section id to which this
-        /// product belongs.</param>
-        /// <param name="invoiceSectionDisplayName">Invoice section display
-        /// name to which this product belongs.</param>
+        /// <param name="displayName">The name of the subscription.</param>
+        /// <param name="subscriptionId">The ID of the subscription.</param>
+        /// <param name="subscriptionBillingStatus">The current billing status
+        /// of the subscription. Possible values include: 'Active', 'Inactive',
+        /// 'Abandoned', 'Deleted', 'Warning'</param>
+        /// <param name="lastMonthCharges">The last month charges.</param>
+        /// <param name="monthToDateCharges">The current month to date
+        /// charges.</param>
+        /// <param name="billingProfileId">The ID of the billing profile to
+        /// which the subscription is billed.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile to which the subscription is billed.</param>
+        /// <param name="costCenter">The cost center applied to the
+        /// subscription.</param>
+        /// <param name="customerId">The ID of the customer for whom the
+        /// subscription was created. The field is applicable only for
+        /// Microsoft Partner Agreement billing account.</param>
+        /// <param name="customerDisplayName">The name of the customer for whom
+        /// the subscription was created. The field is applicable only for
+        /// Microsoft Partner Agreement billing account.</param>
+        /// <param name="invoiceSectionId">The ID of the invoice section to
+        /// which the subscription is billed.</param>
+        /// <param name="invoiceSectionDisplayName">The name of the invoice
+        /// section to which the subscription is billed.</param>
         /// <param name="reseller">Reseller for this subscription.</param>
-        /// <param name="skuId">The sku id.</param>
-        /// <param name="skuDescription">The sku description.</param>
-        public BillingSubscription(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), System.Guid? subscriptionId = default(System.Guid?), string subscriptionBillingStatus = default(string), Amount lastMonthCharges = default(Amount), Amount monthToDateCharges = default(Amount), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string customerId = default(string), string customerDisplayName = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), Reseller reseller = default(Reseller), string skuId = default(string), string skuDescription = default(string))
+        /// <param name="skuId">The sku ID of the Azure plan for the
+        /// subscription.</param>
+        /// <param name="skuDescription">The sku description of the Azure plan
+        /// for the subscription.</param>
+        public BillingSubscription(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), System.Guid? subscriptionId = default(System.Guid?), string subscriptionBillingStatus = default(string), Amount lastMonthCharges = default(Amount), Amount monthToDateCharges = default(Amount), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string costCenter = default(string), string customerId = default(string), string customerDisplayName = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), Reseller reseller = default(Reseller), string skuId = default(string), string skuDescription = default(string))
             : base(id, name, type)
         {
             DisplayName = displayName;
@@ -67,6 +74,7 @@ public BillingSubscription()
             MonthToDateCharges = monthToDateCharges;
             BillingProfileId = billingProfileId;
             BillingProfileDisplayName = billingProfileDisplayName;
+            CostCenter = costCenter;
             CustomerId = customerId;
             CustomerDisplayName = customerDisplayName;
             InvoiceSectionId = invoiceSectionId;
@@ -83,68 +91,83 @@ public BillingSubscription()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets display name.
+        /// Gets the name of the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.displayName")]
         public string DisplayName { get; private set; }
 
         /// <summary>
-        /// Gets subscription Id.
+        /// Gets the ID of the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.subscriptionId")]
         public System.Guid? SubscriptionId { get; private set; }
 
         /// <summary>
-        /// Gets or sets subscription billing status. Possible values include:
-        /// 'Active', 'Inactive', 'Abandoned', 'Deleted', 'Warning'
+        /// Gets or sets the current billing status of the subscription.
+        /// Possible values include: 'Active', 'Inactive', 'Abandoned',
+        /// 'Deleted', 'Warning'
         /// </summary>
         [JsonProperty(PropertyName = "properties.subscriptionBillingStatus")]
         public string SubscriptionBillingStatus { get; set; }
 
         /// <summary>
-        /// Gets last month charges.
+        /// Gets the last month charges.
         /// </summary>
         [JsonProperty(PropertyName = "properties.lastMonthCharges")]
         public Amount LastMonthCharges { get; private set; }
 
         /// <summary>
-        /// Gets month to date charges.
+        /// Gets the current month to date charges.
         /// </summary>
         [JsonProperty(PropertyName = "properties.monthToDateCharges")]
         public Amount MonthToDateCharges { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile id to which this product belongs.
+        /// Gets the ID of the billing profile to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile display name to which this product belongs.
+        /// Gets the name of the billing profile to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets customer id to which this product belongs.
+        /// Gets or sets the cost center applied to the subscription.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.costCenter")]
+        public string CostCenter { get; set; }
+
+        /// <summary>
+        /// Gets the ID of the customer for whom the subscription was created.
+        /// The field is applicable only for Microsoft Partner Agreement
+        /// billing account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerId")]
         public string CustomerId { get; private set; }
 
         /// <summary>
-        /// Gets display name of customer to which this product belongs.
+        /// Gets the name of the customer for whom the subscription was
+        /// created. The field is applicable only for Microsoft Partner
+        /// Agreement billing account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerDisplayName")]
         public string CustomerDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets invoice section id to which this product belongs.
+        /// Gets the ID of the invoice section to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionId")]
         public string InvoiceSectionId { get; private set; }
 
         /// <summary>
-        /// Gets invoice section display name to which this product belongs.
+        /// Gets the name of the invoice section to which the subscription is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionDisplayName")]
         public string InvoiceSectionDisplayName { get; private set; }
@@ -156,13 +179,13 @@ public BillingSubscription()
         public Reseller Reseller { get; private set; }
 
         /// <summary>
-        /// Gets or sets the sku id.
+        /// Gets or sets the sku ID of the Azure plan for the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuId")]
         public string SkuId { get; set; }
 
         /// <summary>
-        /// Gets the sku description.
+        /// Gets the sku description of the Azure plan for the subscription.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuDescription")]
         public string SkuDescription { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsListResult.cs
deleted file mode 100644
index 65f02e801fef7..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsListResult.cs
+++ /dev/null
@@ -1,64 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing billing subscriptions.
-    /// </summary>
-    public partial class BillingSubscriptionsListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the BillingSubscriptionsListResult
-        /// class.
-        /// </summary>
-        public BillingSubscriptionsListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the BillingSubscriptionsListResult
-        /// class.
-        /// </summary>
-        /// <param name="value">The list of billing subscriptions.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public BillingSubscriptionsListResult(IList<BillingSubscription> value = default(IList<BillingSubscription>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of billing subscriptions.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<BillingSubscription> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCreditsUpdateHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsMoveHeaders.cs
similarity index 61%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCreditsUpdateHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsMoveHeaders.cs
index 11328f1778e59..39f89953b85dc 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCreditsUpdateHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingSubscriptionsMoveHeaders.cs
@@ -14,25 +14,28 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Update operation.
+    /// Defines headers for Move operation.
     /// </summary>
-    public partial class LineOfCreditsUpdateHeaders
+    public partial class BillingSubscriptionsMoveHeaders
     {
         /// <summary>
-        /// Initializes a new instance of the LineOfCreditsUpdateHeaders class.
+        /// Initializes a new instance of the BillingSubscriptionsMoveHeaders
+        /// class.
         /// </summary>
-        public LineOfCreditsUpdateHeaders()
+        public BillingSubscriptionsMoveHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the LineOfCreditsUpdateHeaders class.
+        /// Initializes a new instance of the BillingSubscriptionsMoveHeaders
+        /// class.
         /// </summary>
         /// <param name="location">Location URI to poll for result.</param>
-        /// <param name="retryAfter">Recommends the retryable time after
-        /// receiving this.</param>
-        public LineOfCreditsUpdateHeaders(string location = default(string), int? retryAfter = default(int?))
+        /// <param name="retryAfter">Recommended time to wait before making
+        /// another request to check the status of the operation. The time is
+        /// specified in seconds.</param>
+        public BillingSubscriptionsMoveHeaders(string location = default(string), int? retryAfter = default(int?))
         {
             Location = location;
             RetryAfter = retryAfter;
@@ -51,7 +54,9 @@ public LineOfCreditsUpdateHeaders()
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets recommends the retryable time after receiving this.
+        /// Gets or sets recommended time to wait before making another request
+        /// to check the status of the operation. The time is specified in
+        /// seconds.
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Category.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Category.cs
new file mode 100644
index 0000000000000..210b36aeaec93
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Category.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for Category.
+    /// </summary>
+    public static class Category
+    {
+        public const string MicrosoftCustomerAgreement = "MicrosoftCustomerAgreement";
+        public const string AffiliatePurchaseTerms = "AffiliatePurchaseTerms";
+        public const string Other = "Other";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Customer.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Customer.cs
index 89c7ab63b4cfe..bf625a111fd01 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Customer.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Customer.cs
@@ -37,14 +37,20 @@ public Customer()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
+        /// <param name="billingProfileId">The ID of the billing profile for
+        /// the invoice section.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile for the invoice section.</param>
         /// <param name="displayName">The name of the customer.</param>
-        /// <param name="enabledAzurePlans">Information about the
-        /// product.</param>
-        /// <param name="resellers">The resellers which are allowed to provide
-        /// service to this customer.</param>
-        public Customer(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>), IList<Reseller> resellers = default(IList<Reseller>))
+        /// <param name="enabledAzurePlans">Azure plans enabled for the
+        /// customer.</param>
+        /// <param name="resellers">The list of resellers for which an Azure
+        /// plan is enabled for the customer.</param>
+        public Customer(string id = default(string), string name = default(string), string type = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string displayName = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>), IList<Reseller> resellers = default(IList<Reseller>))
             : base(id, name, type)
         {
+            BillingProfileId = billingProfileId;
+            BillingProfileDisplayName = billingProfileDisplayName;
             DisplayName = displayName;
             EnabledAzurePlans = enabledAzurePlans;
             Resellers = resellers;
@@ -56,6 +62,18 @@ public Customer()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets the ID of the billing profile for the invoice section.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingProfileId")]
+        public string BillingProfileId { get; private set; }
+
+        /// <summary>
+        /// Gets the name of the billing profile for the invoice section.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
+        public string BillingProfileDisplayName { get; private set; }
+
         /// <summary>
         /// Gets or sets the name of the customer.
         /// </summary>
@@ -63,14 +81,14 @@ public Customer()
         public string DisplayName { get; set; }
 
         /// <summary>
-        /// Gets or sets information about the product.
+        /// Gets or sets azure plans enabled for the customer.
         /// </summary>
         [JsonProperty(PropertyName = "properties.enabledAzurePlans")]
         public IList<AzurePlan> EnabledAzurePlans { get; set; }
 
         /// <summary>
-        /// Gets or sets the resellers which are allowed to provide service to
-        /// this customer.
+        /// Gets or sets the list of resellers for which an Azure plan is
+        /// enabled for the customer.
         /// </summary>
         [JsonProperty(PropertyName = "properties.resellers")]
         public IList<Reseller> Resellers { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerPolicy.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerPolicy.cs
index 2102f397542af..312bd9f3d5c8c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerPolicy.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/CustomerPolicy.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The Customer's Policy.
+    /// The customer's Policy.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class CustomerPolicy : Resource
@@ -35,8 +35,9 @@ public CustomerPolicy()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="viewCharges">Customer can view retail prices. Possible
-        /// values include: 'Allowed', 'NotAllowed'</param>
+        /// <param name="viewCharges">The policy that controls whether the
+        /// users in customer's organization can view charges at pay-as-you-go
+        /// prices. Possible values include: 'Allowed', 'NotAllowed'</param>
         public CustomerPolicy(string id = default(string), string name = default(string), string type = default(string), string viewCharges = default(string))
             : base(id, name, type)
         {
@@ -50,8 +51,9 @@ public CustomerPolicy()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets customer can view retail prices. Possible values
-        /// include: 'Allowed', 'NotAllowed'
+        /// Gets or sets the policy that controls whether the users in
+        /// customer's organization can view charges at pay-as-you-go prices.
+        /// Possible values include: 'Allowed', 'NotAllowed'
         /// </summary>
         [JsonProperty(PropertyName = "properties.viewCharges")]
         public string ViewCharges { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Department.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Department.cs
index 84bf3ae4e6ab4..6b63c084490ca 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Department.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Department.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A department resource.
+    /// A department.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Department : Resource
@@ -37,9 +37,10 @@ public Department()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="departmentName">The name for department.</param>
-        /// <param name="costCenter">The cost center name.</param>
-        /// <param name="status">The status for department.</param>
+        /// <param name="departmentName">The name of the department.</param>
+        /// <param name="costCenter">The cost center associated with the
+        /// department.</param>
+        /// <param name="status">The status of the department.</param>
         /// <param name="enrollmentAccounts">Associated enrollment accounts. By
         /// default this is not populated, unless it's specified in
         /// $expand.</param>
@@ -59,19 +60,19 @@ public Department()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the name for department.
+        /// Gets or sets the name of the department.
         /// </summary>
         [JsonProperty(PropertyName = "properties.departmentName")]
         public string DepartmentName { get; set; }
 
         /// <summary>
-        /// Gets or sets the cost center name.
+        /// Gets or sets the cost center associated with the department.
         /// </summary>
         [JsonProperty(PropertyName = "properties.costCenter")]
         public string CostCenter { get; set; }
 
         /// <summary>
-        /// Gets or sets the status for department.
+        /// Gets or sets the status of the department.
         /// </summary>
         [JsonProperty(PropertyName = "properties.status")]
         public string Status { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DepartmentListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DepartmentListResult.cs
deleted file mode 100644
index c9395d6f73c09..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DepartmentListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing departments.
-    /// </summary>
-    public partial class DepartmentListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the DepartmentListResult class.
-        /// </summary>
-        public DepartmentListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the DepartmentListResult class.
-        /// </summary>
-        /// <param name="value">The list of departments.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public DepartmentListResult(IList<Department> value = default(IList<Department>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of departments.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<Department> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DetailedTransferStatus.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DetailedTransferStatus.cs
deleted file mode 100644
index 05c4b113ab35f..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DetailedTransferStatus.cs
+++ /dev/null
@@ -1,81 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Detailed transfer status.
-    /// </summary>
-    public partial class DetailedTransferStatus
-    {
-        /// <summary>
-        /// Initializes a new instance of the DetailedTransferStatus class.
-        /// </summary>
-        public DetailedTransferStatus()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the DetailedTransferStatus class.
-        /// </summary>
-        /// <param name="productType">Type of product being transferred.
-        /// Possible values include: 'AzureSubscription',
-        /// 'AzureReservation'</param>
-        /// <param name="productId">Id of product being transferred.</param>
-        /// <param name="transferStatus">Transfer status. Possible values
-        /// include: 'NotStarted', 'InProgress', 'Completed', 'Failed'</param>
-        /// <param name="errorDetails">Error details for transfer
-        /// execution.</param>
-        public DetailedTransferStatus(string productType = default(string), string productId = default(string), string transferStatus = default(string), Error errorDetails = default(Error))
-        {
-            ProductType = productType;
-            ProductId = productId;
-            TransferStatus = transferStatus;
-            ErrorDetails = errorDetails;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets type of product being transferred. Possible values include:
-        /// 'AzureSubscription', 'AzureReservation'
-        /// </summary>
-        [JsonProperty(PropertyName = "productType")]
-        public string ProductType { get; private set; }
-
-        /// <summary>
-        /// Gets id of product being transferred.
-        /// </summary>
-        [JsonProperty(PropertyName = "productId")]
-        public string ProductId { get; private set; }
-
-        /// <summary>
-        /// Gets transfer status. Possible values include: 'NotStarted',
-        /// 'InProgress', 'Completed', 'Failed'
-        /// </summary>
-        [JsonProperty(PropertyName = "transferStatus")]
-        public string TransferStatus { get; private set; }
-
-        /// <summary>
-        /// Gets or sets error details for transfer execution.
-        /// </summary>
-        [JsonProperty(PropertyName = "errorDetails")]
-        public Error ErrorDetails { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Document.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Document.cs
index 36f973b7dd431..974ab59c7b27c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Document.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Document.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The properties of the invoice download.
+    /// The properties of a document.
     /// </summary>
     public partial class Document
     {
@@ -29,13 +29,17 @@ public Document()
         /// <summary>
         /// Initializes a new instance of the Document class.
         /// </summary>
-        /// <param name="kind">Document type. Possible values include:
-        /// 'Invoice', 'VoidNote', 'Receipt', 'CreditNote'</param>
+        /// <param name="kind">The type of the document. Possible values
+        /// include: 'Invoice', 'VoidNote', 'TaxReceipt', 'CreditNote'</param>
         /// <param name="url">Document URL.</param>
-        public Document(string kind = default(string), string url = default(string))
+        /// <param name="source">The source of the document. ENF for Brazil and
+        /// DRS for rest of the world. Possible values include: 'DRS',
+        /// 'ENF'</param>
+        public Document(string kind = default(string), string url = default(string), string source = default(string))
         {
             Kind = kind;
             Url = url;
+            Source = source;
             CustomInit();
         }
 
@@ -45,8 +49,8 @@ public Document()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets document type. Possible values include: 'Invoice', 'VoidNote',
-        /// 'Receipt', 'CreditNote'
+        /// Gets the type of the document. Possible values include: 'Invoice',
+        /// 'VoidNote', 'TaxReceipt', 'CreditNote'
         /// </summary>
         [JsonProperty(PropertyName = "kind")]
         public string Kind { get; private set; }
@@ -57,5 +61,12 @@ public Document()
         [JsonProperty(PropertyName = "url")]
         public string Url { get; private set; }
 
+        /// <summary>
+        /// Gets the source of the document. ENF for Brazil and DRS for rest of
+        /// the world. Possible values include: 'DRS', 'ENF'
+        /// </summary>
+        [JsonProperty(PropertyName = "source")]
+        public string Source { get; private set; }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenew.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentSource.cs
similarity index 72%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenew.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentSource.cs
index df0685604f89a..95c505550f6ee 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenew.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentSource.cs
@@ -12,11 +12,11 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for UpdateAutoRenew.
+    /// Defines values for DocumentSource.
     /// </summary>
-    public static class UpdateAutoRenew
+    public static class DocumentSource
     {
-        public const string True = "true";
-        public const string False = "false";
+        public const string DRS = "DRS";
+        public const string ENF = "ENF";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentType.cs
index 6a75ed6700685..1ea4d2a5e778d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentType.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DocumentType.cs
@@ -18,7 +18,7 @@ public static class DocumentType
     {
         public const string Invoice = "Invoice";
         public const string VoidNote = "VoidNote";
-        public const string Receipt = "Receipt";
+        public const string TaxReceipt = "TaxReceipt";
         public const string CreditNote = "CreditNote";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DownloadUrl.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DownloadUrl.cs
index c6ff0b1a7ae4e..9fe7195f58433 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DownloadUrl.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/DownloadUrl.cs
@@ -30,8 +30,8 @@ public DownloadUrl()
         /// <summary>
         /// Initializes a new instance of the DownloadUrl class.
         /// </summary>
-        /// <param name="expiryTime">The time in UTC at which this download URL
-        /// will expire.</param>
+        /// <param name="expiryTime">The time in UTC when the download URL will
+        /// expire.</param>
         /// <param name="url">The URL to the PDF file.</param>
         public DownloadUrl(System.DateTime? expiryTime = default(System.DateTime?), string url = default(string))
         {
@@ -46,7 +46,7 @@ public DownloadUrl()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the time in UTC at which this download URL will expire.
+        /// Gets the time in UTC when the download URL will expire.
         /// </summary>
         [JsonProperty(PropertyName = "expiryTime")]
         public System.DateTime? ExpiryTime { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Enrollment.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Enrollment.cs
index ebe3c42ea2e6e..2a45edbd0101d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Enrollment.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Enrollment.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Current entity level details
+    /// The properties of an enrollment.
     /// </summary>
     public partial class Enrollment
     {
@@ -29,17 +29,19 @@ public Enrollment()
         /// <summary>
         /// Initializes a new instance of the Enrollment class.
         /// </summary>
-        /// <param name="startDate">Enrollment Start Date</param>
-        /// <param name="endDate">Enrollment End Date</param>
-        /// <param name="currency">The currency associated with
-        /// enrollment</param>
-        /// <param name="channel">The channel for Enrollment</param>
-        /// <param name="policies">The attributes associated with legacy
+        /// <param name="startDate">The start date of the enrollment.</param>
+        /// <param name="endDate">The end date of the enrollment.</param>
+        /// <param name="currency">The billing currency for the
+        /// enrollment.</param>
+        /// <param name="channel">The channel type of the enrollment.</param>
+        /// <param name="policies">The policies for Enterprise Agreement
+        /// enrollments.</param>
+        /// <param name="language">The language for the enrollment.</param>
+        /// <param name="countryCode">The country code of the
+        /// enrollment.</param>
+        /// <param name="status">The current status of the enrollment.</param>
+        /// <param name="billingCycle">The billing cycle for the
         /// enrollment.</param>
-        /// <param name="language">The language for Enrollment</param>
-        /// <param name="countryCode">The countryCode for Enrollment</param>
-        /// <param name="status">Enrollment status</param>
-        /// <param name="billingCycle">Enrollment billing cycle</param>
         public Enrollment(System.DateTime? startDate = default(System.DateTime?), System.DateTime? endDate = default(System.DateTime?), string currency = default(string), string channel = default(string), EnrollmentPolicies policies = default(EnrollmentPolicies), string language = default(string), string countryCode = default(string), string status = default(string), string billingCycle = default(string))
         {
             StartDate = startDate;
@@ -60,55 +62,55 @@ public Enrollment()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets enrollment Start Date
+        /// Gets or sets the start date of the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "startDate")]
         public System.DateTime? StartDate { get; set; }
 
         /// <summary>
-        /// Gets or sets enrollment End Date
+        /// Gets or sets the end date of the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "endDate")]
         public System.DateTime? EndDate { get; set; }
 
         /// <summary>
-        /// Gets the currency associated with enrollment
+        /// Gets the billing currency for the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "currency")]
         public string Currency { get; private set; }
 
         /// <summary>
-        /// Gets the channel for Enrollment
+        /// Gets the channel type of the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "channel")]
         public string Channel { get; private set; }
 
         /// <summary>
-        /// Gets the attributes associated with legacy enrollment.
+        /// Gets the policies for Enterprise Agreement enrollments.
         /// </summary>
         [JsonProperty(PropertyName = "policies")]
         public EnrollmentPolicies Policies { get; private set; }
 
         /// <summary>
-        /// Gets the language for Enrollment
+        /// Gets the language for the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "language")]
         public string Language { get; private set; }
 
         /// <summary>
-        /// Gets the countryCode for Enrollment
+        /// Gets the country code of the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "countryCode")]
         public string CountryCode { get; private set; }
 
         /// <summary>
-        /// Gets enrollment status
+        /// Gets the current status of the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; private set; }
 
         /// <summary>
-        /// Gets enrollment billing cycle
+        /// Gets the billing cycle for the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "billingCycle")]
         public string BillingCycle { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccount.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccount.cs
index e732dd3876a9c..140c2fb209c52 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccount.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccount.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// An account resource.
+    /// An enrollment account.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class EnrollmentAccount : Resource
@@ -35,12 +35,17 @@ public EnrollmentAccount()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="accountName">The account name.</param>
-        /// <param name="costCenter">The cost center name.</param>
-        /// <param name="accountOwner">The account owner</param>
-        /// <param name="status">The status for account.</param>
-        /// <param name="startDate">Account Start Date</param>
-        /// <param name="endDate">Account End Date</param>
+        /// <param name="accountName">The name of the enrollment
+        /// account.</param>
+        /// <param name="costCenter">The cost center associated with the
+        /// enrollment account.</param>
+        /// <param name="accountOwner">The owner of the enrollment
+        /// account.</param>
+        /// <param name="status">The status of the enrollment account.</param>
+        /// <param name="startDate">The start date of the enrollment
+        /// account.</param>
+        /// <param name="endDate">The end date of the enrollment
+        /// account.</param>
         /// <param name="department">Associated department. By default this is
         /// not populated, unless it's specified in $expand.</param>
         public EnrollmentAccount(string id = default(string), string name = default(string), string type = default(string), string accountName = default(string), string costCenter = default(string), string accountOwner = default(string), string status = default(string), System.DateTime? startDate = default(System.DateTime?), System.DateTime? endDate = default(System.DateTime?), Department department = default(Department))
@@ -62,37 +67,38 @@ public EnrollmentAccount()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the account name.
+        /// Gets or sets the name of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.accountName")]
         public string AccountName { get; set; }
 
         /// <summary>
-        /// Gets or sets the cost center name.
+        /// Gets or sets the cost center associated with the enrollment
+        /// account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.costCenter")]
         public string CostCenter { get; set; }
 
         /// <summary>
-        /// Gets or sets the account owner
+        /// Gets or sets the owner of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.accountOwner")]
         public string AccountOwner { get; set; }
 
         /// <summary>
-        /// Gets or sets the status for account.
+        /// Gets or sets the status of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.status")]
         public string Status { get; set; }
 
         /// <summary>
-        /// Gets or sets account Start Date
+        /// Gets or sets the start date of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.startDate")]
         public System.DateTime? StartDate { get; set; }
 
         /// <summary>
-        /// Gets or sets account End Date
+        /// Gets or sets the end date of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.endDate")]
         public System.DateTime? EndDate { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountContext.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountContext.cs
index fc76a58333bc8..650e0b3eb3b0f 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountContext.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountContext.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The rating context.
+    /// The enrollment account context
     /// </summary>
     public partial class EnrollmentAccountContext
     {
@@ -29,11 +29,14 @@ public EnrollmentAccountContext()
         /// <summary>
         /// Initializes a new instance of the EnrollmentAccountContext class.
         /// </summary>
-        /// <param name="costCenter">The cost center name.</param>
-        /// <param name="startDate">Account Start Date</param>
-        /// <param name="endDate">Account End Date</param>
-        /// <param name="enrollmentAccountName">The enrollment account
-        /// id.</param>
+        /// <param name="costCenter">The cost center associated with the
+        /// enrollment account.</param>
+        /// <param name="startDate">The start date of the enrollment
+        /// account.</param>
+        /// <param name="endDate">The end date of the enrollment
+        /// account.</param>
+        /// <param name="enrollmentAccountName">The ID of the enrollment
+        /// account.</param>
         public EnrollmentAccountContext(string costCenter = default(string), System.DateTime? startDate = default(System.DateTime?), System.DateTime? endDate = default(System.DateTime?), string enrollmentAccountName = default(string))
         {
             CostCenter = costCenter;
@@ -49,25 +52,26 @@ public EnrollmentAccountContext()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the cost center name.
+        /// Gets or sets the cost center associated with the enrollment
+        /// account.
         /// </summary>
         [JsonProperty(PropertyName = "costCenter")]
         public string CostCenter { get; set; }
 
         /// <summary>
-        /// Gets or sets account Start Date
+        /// Gets or sets the start date of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "startDate")]
         public System.DateTime? StartDate { get; set; }
 
         /// <summary>
-        /// Gets or sets account End Date
+        /// Gets or sets the end date of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "endDate")]
         public System.DateTime? EndDate { get; set; }
 
         /// <summary>
-        /// Gets or sets the enrollment account id.
+        /// Gets or sets the ID of the enrollment account.
         /// </summary>
         [JsonProperty(PropertyName = "enrollmentAccountName")]
         public string EnrollmentAccountName { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountListResult.cs
deleted file mode 100644
index 6f15df453de94..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentAccountListResult.cs
+++ /dev/null
@@ -1,64 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing enrollment accounts.
-    /// </summary>
-    public partial class EnrollmentAccountListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the EnrollmentAccountListResult
-        /// class.
-        /// </summary>
-        public EnrollmentAccountListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the EnrollmentAccountListResult
-        /// class.
-        /// </summary>
-        /// <param name="value">The list of enrollment accounts.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public EnrollmentAccountListResult(IList<EnrollmentAccount> value = default(IList<EnrollmentAccount>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of enrollment accounts.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<EnrollmentAccount> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentPolicies.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentPolicies.cs
index 622d4a2df7e1e..a01dd23728c38 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentPolicies.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/EnrollmentPolicies.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The attributes associated with legacy enrollment
+    /// The policies for Enterprise Agreement enrollments.
     /// </summary>
     public partial class EnrollmentPolicies
     {
@@ -29,14 +29,15 @@ public EnrollmentPolicies()
         /// <summary>
         /// Initializes a new instance of the EnrollmentPolicies class.
         /// </summary>
-        /// <param name="accountOwnerViewCharges">The accountOwnerViewCharges
-        /// flag for Enrollment</param>
-        /// <param name="departmentAdminViewCharges">The
-        /// departmentAdminViewCharges flag for Enrollment</param>
-        /// <param name="marketplacesEnabled">The marketplaces flag for
-        /// Enrollment</param>
-        /// <param name="reservedInstancesEnabled">The reserved instances flag
-        /// for Enrollment</param>
+        /// <param name="accountOwnerViewCharges">The policy that controls
+        /// whether Account Owners can view charges.</param>
+        /// <param name="departmentAdminViewCharges">The policy that controls
+        /// whether Department Administrators can view charges.</param>
+        /// <param name="marketplacesEnabled">The policy that controls whether
+        /// Azure marketplace purchases are allowed in the enrollment.</param>
+        /// <param name="reservedInstancesEnabled">The policy that controls
+        /// whether Azure reservation purchases are allowed in the
+        /// enrollment.</param>
         public EnrollmentPolicies(bool? accountOwnerViewCharges = default(bool?), bool? departmentAdminViewCharges = default(bool?), bool? marketplacesEnabled = default(bool?), bool? reservedInstancesEnabled = default(bool?))
         {
             AccountOwnerViewCharges = accountOwnerViewCharges;
@@ -52,25 +53,29 @@ public EnrollmentPolicies()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the accountOwnerViewCharges flag for Enrollment
+        /// Gets the policy that controls whether Account Owners can view
+        /// charges.
         /// </summary>
         [JsonProperty(PropertyName = "accountOwnerViewCharges")]
         public bool? AccountOwnerViewCharges { get; private set; }
 
         /// <summary>
-        /// Gets the departmentAdminViewCharges flag for Enrollment
+        /// Gets the policy that controls whether Department Administrators can
+        /// view charges.
         /// </summary>
         [JsonProperty(PropertyName = "departmentAdminViewCharges")]
         public bool? DepartmentAdminViewCharges { get; private set; }
 
         /// <summary>
-        /// Gets the marketplaces flag for Enrollment
+        /// Gets the policy that controls whether Azure marketplace purchases
+        /// are allowed in the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "marketplacesEnabled")]
         public bool? MarketplacesEnabled { get; private set; }
 
         /// <summary>
-        /// Gets the reserved instances flag for Enrollment
+        /// Gets the policy that controls whether Azure reservation purchases
+        /// are allowed in the enrollment.
         /// </summary>
         [JsonProperty(PropertyName = "reservedInstancesEnabled")]
         public bool? ReservedInstancesEnabled { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Error.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Error.cs
deleted file mode 100644
index f06f1ac89a18e..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Error.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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Error details for transfer execution.
-    /// </summary>
-    public partial class Error
-    {
-        /// <summary>
-        /// Initializes a new instance of the Error class.
-        /// </summary>
-        public Error()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the Error class.
-        /// </summary>
-        /// <param name="errorCode">Error code.</param>
-        /// <param name="errorMessage">Error message.</param>
-        public Error(string errorCode = default(string), string errorMessage = default(string))
-        {
-            ErrorCode = errorCode;
-            ErrorMessage = errorMessage;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets error code.
-        /// </summary>
-        [JsonProperty(PropertyName = "errorCode")]
-        public string ErrorCode { get; private set; }
-
-        /// <summary>
-        /// Gets error message.
-        /// </summary>
-        [JsonProperty(PropertyName = "errorMessage")]
-        public string ErrorMessage { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InitiateTransferRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InitiateTransferRequest.cs
deleted file mode 100644
index 00b981362f05b..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InitiateTransferRequest.cs
+++ /dev/null
@@ -1,63 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Request parameters to initiate transfer.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class InitiateTransferRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the InitiateTransferRequest class.
-        /// </summary>
-        public InitiateTransferRequest()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InitiateTransferRequest class.
-        /// </summary>
-        /// <param name="recipientEmailId">Email Id of recipient for
-        /// transfer.</param>
-        /// <param name="resellerId">Optional reseller Id for transfer.</param>
-        public InitiateTransferRequest(string recipientEmailId = default(string), string resellerId = default(string))
-        {
-            RecipientEmailId = recipientEmailId;
-            ResellerId = resellerId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets email Id of recipient for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.recipientEmailId")]
-        public string RecipientEmailId { get; set; }
-
-        /// <summary>
-        /// Gets or sets optional reseller Id for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.resellerId")]
-        public string ResellerId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Instruction.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Instruction.cs
new file mode 100644
index 0000000000000..5fd2787f50e4e
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Instruction.cs
@@ -0,0 +1,97 @@
+// <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.Billing.Models
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Serialization;
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// An instruction.
+    /// </summary>
+    [Rest.Serialization.JsonTransformation]
+    public partial class Instruction : Resource
+    {
+        /// <summary>
+        /// Initializes a new instance of the Instruction class.
+        /// </summary>
+        public Instruction()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Instruction class.
+        /// </summary>
+        /// <param name="amount">The amount budgeted for this billing
+        /// instruction.</param>
+        /// <param name="startDate">The date this billing instruction goes into
+        /// effect.</param>
+        /// <param name="endDate">The date this billing instruction is no
+        /// longer in effect.</param>
+        /// <param name="id">Resource Id.</param>
+        /// <param name="name">Resource name.</param>
+        /// <param name="type">Resource type.</param>
+        /// <param name="creationDate">The date this billing instruction was
+        /// created.</param>
+        public Instruction(double amount, System.DateTime startDate, System.DateTime endDate, string id = default(string), string name = default(string), string type = default(string), System.DateTime? creationDate = default(System.DateTime?))
+            : base(id, name, type)
+        {
+            Amount = amount;
+            StartDate = startDate;
+            EndDate = endDate;
+            CreationDate = creationDate;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets the amount budgeted for this billing instruction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.amount")]
+        public double Amount { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date this billing instruction goes into effect.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.startDate")]
+        public System.DateTime StartDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date this billing instruction is no longer in
+        /// effect.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.endDate")]
+        public System.DateTime EndDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date this billing instruction was created.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.creationDate")]
+        public System.DateTime? CreationDate { get; set; }
+
+        /// <summary>
+        /// Validate the object.
+        /// </summary>
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            //Nothing to validate
+        }
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Invoice.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Invoice.cs
index 6bb05a36f3c3e..6d360f88ac10c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Invoice.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Invoice.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// An invoice resource.
+    /// An invoice.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Invoice : Resource
@@ -37,43 +37,78 @@ public Invoice()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="dueDate">The due date for invoice.</param>
-        /// <param name="invoiceDate">The date when invoice was
-        /// created.</param>
-        /// <param name="status">Invoice status. Possible values include:
-        /// 'PastDue', 'Due', 'Paid', 'Void'</param>
-        /// <param name="amountDue">Amount due.</param>
-        /// <param name="billedAmount">Amount billed.</param>
+        /// <param name="dueDate">The due date for the invoice.</param>
+        /// <param name="invoiceDate">The date when the invoice was
+        /// generated.</param>
+        /// <param name="status">The current status of the invoice. Possible
+        /// values include: 'Due', 'OverDue', 'Paid'</param>
+        /// <param name="amountDue">The amount due as of now.</param>
+        /// <param name="azurePrepaymentApplied">The amount of Azure prepayment
+        /// applied to the charges. This field is applicable to billing
+        /// accounts with agreement type Microsoft Customer Agreement.</param>
+        /// <param name="billedAmount">The total charges for the invoice
+        /// billing period.</param>
+        /// <param name="creditAmount">The total refund for returns and
+        /// cancellations during the invoice billing period. This field is
+        /// applicable to billing accounts with agreement type Microsoft
+        /// Customer Agreement.</param>
+        /// <param name="freeAzureCreditApplied">The amount of free Azure
+        /// credits applied to the charges. This field is applicable to billing
+        /// accounts with agreement type Microsoft Customer Agreement.</param>
+        /// <param name="subTotal">The pre-tax amount due. This field is
+        /// applicable to billing accounts with agreement type Microsoft
+        /// Customer Agreement.</param>
+        /// <param name="taxAmount">The amount of tax charged for the billing
+        /// period. This field is applicable to billing accounts with agreement
+        /// type Microsoft Customer Agreement.</param>
+        /// <param name="totalAmount">The amount due when the invoice was
+        /// generated. This field is applicable to billing accounts with
+        /// agreement type Microsoft Customer Agreement.</param>
         /// <param name="invoicePeriodStartDate">The start date of the billing
-        /// period.</param>
+        /// period for which the invoice is generated.</param>
         /// <param name="invoicePeriodEndDate">The end date of the billing
-        /// period.</param>
-        /// <param name="invoiceType">Invoice type.</param>
-        /// <param name="billingProfileId">The billing profile id this invoice
-        /// belongs to.</param>
-        /// <param name="billingProfileDisplayName">The billing profile display
-        /// name this invoice belongs to.</param>
-        /// <param name="purchaseOrderNumber">The purchase identifier for the
-        /// invoice.</param>
+        /// period for which the invoice is generated.</param>
+        /// <param name="invoiceType">Invoice type. Possible values include:
+        /// 'AzureService', 'AzureMarketplace', 'AzureSupport'</param>
+        /// <param name="isMonthlyInvoice">Specifies if the invoice is
+        /// generated as part of monthly invoicing cycle or not. This field is
+        /// applicable to billing accounts with agreement type Microsoft
+        /// Customer Agreement.</param>
+        /// <param name="billingProfileId">The ID of the billing profile for
+        /// which the invoice is generated.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile for which the invoice is generated.</param>
+        /// <param name="purchaseOrderNumber">An optional purchase order number
+        /// for the invoice.</param>
         /// <param name="documents">List of documents available to download
-        /// including invoice and tax documents.</param>
+        /// such as invoice and tax receipt.</param>
         /// <param name="payments">List of payments.</param>
-        public Invoice(string id = default(string), string name = default(string), string type = default(string), System.DateTime? dueDate = default(System.DateTime?), System.DateTime? invoiceDate = default(System.DateTime?), string status = default(string), Amount amountDue = default(Amount), Amount billedAmount = default(Amount), System.DateTime? invoicePeriodStartDate = default(System.DateTime?), System.DateTime? invoicePeriodEndDate = default(System.DateTime?), object invoiceType = default(object), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string purchaseOrderNumber = default(string), IList<Document> documents = default(IList<Document>), IList<PaymentProperties> payments = default(IList<PaymentProperties>))
+        /// <param name="subscriptionId">The ID of the subscription for which
+        /// the invoice is generated.</param>
+        public Invoice(string id = default(string), string name = default(string), string type = default(string), System.DateTime? dueDate = default(System.DateTime?), System.DateTime? invoiceDate = default(System.DateTime?), string status = default(string), Amount amountDue = default(Amount), Amount azurePrepaymentApplied = default(Amount), Amount billedAmount = default(Amount), Amount creditAmount = default(Amount), Amount freeAzureCreditApplied = default(Amount), Amount subTotal = default(Amount), Amount taxAmount = default(Amount), Amount totalAmount = default(Amount), System.DateTime? invoicePeriodStartDate = default(System.DateTime?), System.DateTime? invoicePeriodEndDate = default(System.DateTime?), string invoiceType = default(string), bool? isMonthlyInvoice = default(bool?), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string purchaseOrderNumber = default(string), IList<Document> documents = default(IList<Document>), IList<PaymentProperties> payments = default(IList<PaymentProperties>), string subscriptionId = default(string))
             : base(id, name, type)
         {
             DueDate = dueDate;
             InvoiceDate = invoiceDate;
             Status = status;
             AmountDue = amountDue;
+            AzurePrepaymentApplied = azurePrepaymentApplied;
             BilledAmount = billedAmount;
+            CreditAmount = creditAmount;
+            FreeAzureCreditApplied = freeAzureCreditApplied;
+            SubTotal = subTotal;
+            TaxAmount = taxAmount;
+            TotalAmount = totalAmount;
             InvoicePeriodStartDate = invoicePeriodStartDate;
             InvoicePeriodEndDate = invoicePeriodEndDate;
             InvoiceType = invoiceType;
+            IsMonthlyInvoice = isMonthlyInvoice;
             BillingProfileId = billingProfileId;
             BillingProfileDisplayName = billingProfileDisplayName;
             PurchaseOrderNumber = purchaseOrderNumber;
             Documents = documents;
             Payments = payments;
+            SubscriptionId = subscriptionId;
             CustomInit();
         }
 
@@ -83,75 +118,135 @@ public Invoice()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the due date for invoice.
+        /// Gets the due date for the invoice.
         /// </summary>
         [JsonProperty(PropertyName = "properties.dueDate")]
         public System.DateTime? DueDate { get; private set; }
 
         /// <summary>
-        /// Gets the date when invoice was created.
+        /// Gets the date when the invoice was generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceDate")]
         public System.DateTime? InvoiceDate { get; private set; }
 
         /// <summary>
-        /// Gets invoice status. Possible values include: 'PastDue', 'Due',
-        /// 'Paid', 'Void'
+        /// Gets the current status of the invoice. Possible values include:
+        /// 'Due', 'OverDue', 'Paid'
         /// </summary>
         [JsonProperty(PropertyName = "properties.status")]
         public string Status { get; private set; }
 
         /// <summary>
-        /// Gets amount due.
+        /// Gets the amount due as of now.
         /// </summary>
         [JsonProperty(PropertyName = "properties.amountDue")]
         public Amount AmountDue { get; private set; }
 
         /// <summary>
-        /// Gets amount billed.
+        /// Gets the amount of Azure prepayment applied to the charges. This
+        /// field is applicable to billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.azurePrepaymentApplied")]
+        public Amount AzurePrepaymentApplied { get; private set; }
+
+        /// <summary>
+        /// Gets the total charges for the invoice billing period.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billedAmount")]
         public Amount BilledAmount { get; private set; }
 
         /// <summary>
-        /// Gets the start date of the billing period.
+        /// Gets the total refund for returns and cancellations during the
+        /// invoice billing period. This field is applicable to billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.creditAmount")]
+        public Amount CreditAmount { get; private set; }
+
+        /// <summary>
+        /// Gets the amount of free Azure credits applied to the charges. This
+        /// field is applicable to billing accounts with agreement type
+        /// Microsoft Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.freeAzureCreditApplied")]
+        public Amount FreeAzureCreditApplied { get; private set; }
+
+        /// <summary>
+        /// Gets the pre-tax amount due. This field is applicable to billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.subTotal")]
+        public Amount SubTotal { get; private set; }
+
+        /// <summary>
+        /// Gets the amount of tax charged for the billing period. This field
+        /// is applicable to billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.taxAmount")]
+        public Amount TaxAmount { get; private set; }
+
+        /// <summary>
+        /// Gets the amount due when the invoice was generated. This field is
+        /// applicable to billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.totalAmount")]
+        public Amount TotalAmount { get; private set; }
+
+        /// <summary>
+        /// Gets the start date of the billing period for which the invoice is
+        /// generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoicePeriodStartDate")]
         public System.DateTime? InvoicePeriodStartDate { get; private set; }
 
         /// <summary>
-        /// Gets the end date of the billing period.
+        /// Gets the end date of the billing period for which the invoice is
+        /// generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoicePeriodEndDate")]
         public System.DateTime? InvoicePeriodEndDate { get; private set; }
 
         /// <summary>
-        /// Gets invoice type.
+        /// Gets invoice type. Possible values include: 'AzureService',
+        /// 'AzureMarketplace', 'AzureSupport'
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceType")]
-        public object InvoiceType { get; private set; }
+        public string InvoiceType { get; private set; }
 
         /// <summary>
-        /// Gets the billing profile id this invoice belongs to.
+        /// Gets specifies if the invoice is generated as part of monthly
+        /// invoicing cycle or not. This field is applicable to billing
+        /// accounts with agreement type Microsoft Customer Agreement.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.isMonthlyInvoice")]
+        public bool? IsMonthlyInvoice { get; private set; }
+
+        /// <summary>
+        /// Gets the ID of the billing profile for which the invoice is
+        /// generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets the billing profile display name this invoice belongs to.
+        /// Gets the name of the billing profile for which the invoice is
+        /// generated.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets the purchase identifier for the invoice.
+        /// Gets an optional purchase order number for the invoice.
         /// </summary>
         [JsonProperty(PropertyName = "properties.purchaseOrderNumber")]
         public string PurchaseOrderNumber { get; private set; }
 
         /// <summary>
-        /// Gets list of documents available to download including invoice and
-        /// tax documents.
+        /// Gets list of documents available to download such as invoice and
+        /// tax receipt.
         /// </summary>
         [JsonProperty(PropertyName = "properties.documents")]
         public IList<Document> Documents { get; private set; }
@@ -162,5 +257,11 @@ public Invoice()
         [JsonProperty(PropertyName = "properties.payments")]
         public IList<PaymentProperties> Payments { get; private set; }
 
+        /// <summary>
+        /// Gets the ID of the subscription for which the invoice is generated.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.subscriptionId")]
+        public string SubscriptionId { get; private set; }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceListResult.cs
deleted file mode 100644
index 29686c43e46f0..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing invoices.
-    /// </summary>
-    public partial class InvoiceListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the InvoiceListResult class.
-        /// </summary>
-        public InvoiceListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvoiceListResult class.
-        /// </summary>
-        /// <param name="value">The list of invoices.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public InvoiceListResult(IList<Invoice> value = default(IList<Invoice>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of invoices.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<Invoice> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSection.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSection.cs
index 7d0e4e64e6d7c..1a7aaac35a841 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSection.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSection.cs
@@ -13,10 +13,12 @@ namespace Microsoft.Azure.Management.Billing.Models
     using Microsoft.Rest;
     using Microsoft.Rest.Serialization;
     using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
     using System.Linq;
 
     /// <summary>
-    /// An InvoiceSection resource.
+    /// An invoice section.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class InvoiceSection : Resource
@@ -35,11 +37,17 @@ public InvoiceSection()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="displayName">The name of the InvoiceSection.</param>
-        public InvoiceSection(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string))
+        /// <param name="displayName">The name of the invoice section.</param>
+        /// <param name="labels">Dictionary of metadata associated with the
+        /// invoice section.</param>
+        /// <param name="systemId">The system generated unique identifier for
+        /// an invoice section.</param>
+        public InvoiceSection(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), IDictionary<string, string> labels = default(IDictionary<string, string>), string systemId = default(string))
             : base(id, name, type)
         {
             DisplayName = displayName;
+            Labels = labels;
+            SystemId = systemId;
             CustomInit();
         }
 
@@ -49,10 +57,23 @@ public InvoiceSection()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the name of the InvoiceSection.
+        /// Gets or sets the name of the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "properties.displayName")]
         public string DisplayName { get; set; }
 
+        /// <summary>
+        /// Gets or sets dictionary of metadata associated with the invoice
+        /// section.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.labels")]
+        public IDictionary<string, string> Labels { get; set; }
+
+        /// <summary>
+        /// Gets the system generated unique identifier for an invoice section.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.systemId")]
+        public string SystemId { get; private set; }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionCreationRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionCreationRequest.cs
index 63666bada0da4..aabc5101d2f23 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionCreationRequest.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionCreationRequest.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The properties of an InvoiceSection.
+    /// The properties of the invoice section.
     /// </summary>
     public partial class InvoiceSectionCreationRequest
     {
@@ -31,7 +31,7 @@ public InvoiceSectionCreationRequest()
         /// Initializes a new instance of the InvoiceSectionCreationRequest
         /// class.
         /// </summary>
-        /// <param name="displayName">The name of the InvoiceSection.</param>
+        /// <param name="displayName">The name of the invoice section.</param>
         public InvoiceSectionCreationRequest(string displayName = default(string))
         {
             DisplayName = displayName;
@@ -44,7 +44,7 @@ public InvoiceSectionCreationRequest()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the name of the InvoiceSection.
+        /// Gets or sets the name of the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "displayName")]
         public string DisplayName { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionListResult.cs
deleted file mode 100644
index f99662b1fb2a0..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing invoice sections.
-    /// </summary>
-    public partial class InvoiceSectionListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the InvoiceSectionListResult class.
-        /// </summary>
-        public InvoiceSectionListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvoiceSectionListResult class.
-        /// </summary>
-        /// <param name="value">The list of invoice sections.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public InvoiceSectionListResult(IList<InvoiceSection> value = default(IList<InvoiceSection>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of invoice sections.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<InvoiceSection> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionWithCreateSubPermission.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionWithCreateSubPermission.cs
index bb5db3d7a2711..3d02822f8b687 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionWithCreateSubPermission.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionWithCreateSubPermission.cs
@@ -33,20 +33,39 @@ public InvoiceSectionWithCreateSubPermission()
         /// Initializes a new instance of the
         /// InvoiceSectionWithCreateSubPermission class.
         /// </summary>
-        /// <param name="invoiceSectionId">Invoice Section Id.</param>
-        /// <param name="invoiceSectionDisplayName">Invoice Section display
-        /// name.</param>
-        /// <param name="billingProfileId">Billing profile Id.</param>
-        /// <param name="billingProfileDisplayName">Billing profile display
-        /// name.</param>
+        /// <param name="invoiceSectionId">The ID of the invoice
+        /// section.</param>
+        /// <param name="invoiceSectionDisplayName">The name of the invoice
+        /// section.</param>
+        /// <param name="invoiceSectionSystemId">The system generated unique
+        /// identifier for an invoice section.</param>
+        /// <param name="billingProfileId">The ID of the billing profile for
+        /// the invoice section.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile for the invoice section.</param>
+        /// <param name="billingProfileStatus">The status of the billing
+        /// profile. Possible values include: 'Active', 'Disabled',
+        /// 'Warned'</param>
+        /// <param name="billingProfileStatusReasonCode">Reason for the
+        /// specified billing profile status. Possible values include:
+        /// 'PastDue', 'SpendingLimitReached', 'SpendingLimitExpired'</param>
+        /// <param name="billingProfileSpendingLimit">The billing profile
+        /// spending limit. Possible values include: 'Off', 'On'</param>
+        /// <param name="billingProfileSystemId">The system generated unique
+        /// identifier for a billing profile.</param>
         /// <param name="enabledAzurePlans">Enabled azure plans for the
         /// associated billing profile.</param>
-        public InvoiceSectionWithCreateSubPermission(string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>))
+        public InvoiceSectionWithCreateSubPermission(string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string invoiceSectionSystemId = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string billingProfileStatus = default(string), string billingProfileStatusReasonCode = default(string), string billingProfileSpendingLimit = default(string), string billingProfileSystemId = default(string), IList<AzurePlan> enabledAzurePlans = default(IList<AzurePlan>))
         {
             InvoiceSectionId = invoiceSectionId;
             InvoiceSectionDisplayName = invoiceSectionDisplayName;
+            InvoiceSectionSystemId = invoiceSectionSystemId;
             BillingProfileId = billingProfileId;
             BillingProfileDisplayName = billingProfileDisplayName;
+            BillingProfileStatus = billingProfileStatus;
+            BillingProfileStatusReasonCode = billingProfileStatusReasonCode;
+            BillingProfileSpendingLimit = billingProfileSpendingLimit;
+            BillingProfileSystemId = billingProfileSystemId;
             EnabledAzurePlans = enabledAzurePlans;
             CustomInit();
         }
@@ -57,29 +76,63 @@ public InvoiceSectionWithCreateSubPermission()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets invoice Section Id.
+        /// Gets the ID of the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "invoiceSectionId")]
         public string InvoiceSectionId { get; private set; }
 
         /// <summary>
-        /// Gets invoice Section display name.
+        /// Gets the name of the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "invoiceSectionDisplayName")]
         public string InvoiceSectionDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets billing profile Id.
+        /// Gets the system generated unique identifier for an invoice section.
+        /// </summary>
+        [JsonProperty(PropertyName = "invoiceSectionSystemId")]
+        public string InvoiceSectionSystemId { get; private set; }
+
+        /// <summary>
+        /// Gets the ID of the billing profile for the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets billing profile display name.
+        /// Gets the name of the billing profile for the invoice section.
         /// </summary>
         [JsonProperty(PropertyName = "billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
+        /// <summary>
+        /// Gets the status of the billing profile. Possible values include:
+        /// 'Active', 'Disabled', 'Warned'
+        /// </summary>
+        [JsonProperty(PropertyName = "billingProfileStatus")]
+        public string BillingProfileStatus { get; private set; }
+
+        /// <summary>
+        /// Gets reason for the specified billing profile status. Possible
+        /// values include: 'PastDue', 'SpendingLimitReached',
+        /// 'SpendingLimitExpired'
+        /// </summary>
+        [JsonProperty(PropertyName = "billingProfileStatusReasonCode")]
+        public string BillingProfileStatusReasonCode { get; private set; }
+
+        /// <summary>
+        /// Gets the billing profile spending limit. Possible values include:
+        /// 'Off', 'On'
+        /// </summary>
+        [JsonProperty(PropertyName = "billingProfileSpendingLimit")]
+        public string BillingProfileSpendingLimit { get; private set; }
+
+        /// <summary>
+        /// Gets the system generated unique identifier for a billing profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "billingProfileSystemId")]
+        public string BillingProfileSystemId { get; private set; }
+
         /// <summary>
         /// Gets or sets enabled azure plans for the associated billing
         /// profile.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateHeaders.cs
deleted file mode 100644
index 347073d3b7c44..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateHeaders.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Defines headers for Create operation.
-    /// </summary>
-    public partial class InvoiceSectionsCreateHeaders
-    {
-        /// <summary>
-        /// Initializes a new instance of the InvoiceSectionsCreateHeaders
-        /// class.
-        /// </summary>
-        public InvoiceSectionsCreateHeaders()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the InvoiceSectionsCreateHeaders
-        /// class.
-        /// </summary>
-        /// <param name="location">Location URI to poll for result</param>
-        /// <param name="retryAfter">Recommends the retryable time after
-        /// receiving this.</param>
-        public InvoiceSectionsCreateHeaders(string location = default(string), int? retryAfter = default(int?))
-        {
-            Location = location;
-            RetryAfter = retryAfter;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets location URI to poll for result
-        /// </summary>
-        [JsonProperty(PropertyName = "Location")]
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets recommends the retryable time after receiving this.
-        /// </summary>
-        [JsonProperty(PropertyName = "Retry-After")]
-        public int? RetryAfter { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateOrUpdateHeaders.cs
similarity index 60%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateOrUpdateHeaders.cs
index c5888737ec7d7..28621c7ef62f3 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesCreateHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsCreateOrUpdateHeaders.cs
@@ -14,27 +14,28 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Create operation.
+    /// Defines headers for CreateOrUpdate operation.
     /// </summary>
-    public partial class BillingProfilesCreateHeaders
+    public partial class InvoiceSectionsCreateOrUpdateHeaders
     {
         /// <summary>
-        /// Initializes a new instance of the BillingProfilesCreateHeaders
-        /// class.
+        /// Initializes a new instance of the
+        /// InvoiceSectionsCreateOrUpdateHeaders class.
         /// </summary>
-        public BillingProfilesCreateHeaders()
+        public InvoiceSectionsCreateOrUpdateHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the BillingProfilesCreateHeaders
-        /// class.
+        /// Initializes a new instance of the
+        /// InvoiceSectionsCreateOrUpdateHeaders class.
         /// </summary>
         /// <param name="location">Location URI to poll for result</param>
-        /// <param name="retryAfter">Recommends the retryable time after
-        /// receiving this.</param>
-        public BillingProfilesCreateHeaders(string location = default(string), int? retryAfter = default(int?))
+        /// <param name="retryAfter">Recommended time to wait before making
+        /// another request to check the status of the operation. The time is
+        /// specified in seconds.</param>
+        public InvoiceSectionsCreateOrUpdateHeaders(string location = default(string), int? retryAfter = default(int?))
         {
             Location = location;
             RetryAfter = retryAfter;
@@ -53,7 +54,9 @@ public BillingProfilesCreateHeaders()
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets recommends the retryable time after receiving this.
+        /// Gets or sets recommended time to wait before making another request
+        /// to check the status of the operation. The time is specified in
+        /// seconds.
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsOnExpand.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsOnExpand.cs
new file mode 100644
index 0000000000000..a30a4a9003e0b
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsOnExpand.cs
@@ -0,0 +1,70 @@
+// <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.Billing.Models
+{
+    using Newtonsoft.Json;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    /// <summary>
+    /// The invoice sections associated to the billing profile. By default this
+    /// is not populated, unless it's specified in $expand.
+    /// </summary>
+    public partial class InvoiceSectionsOnExpand
+    {
+        /// <summary>
+        /// Initializes a new instance of the InvoiceSectionsOnExpand class.
+        /// </summary>
+        public InvoiceSectionsOnExpand()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InvoiceSectionsOnExpand class.
+        /// </summary>
+        /// <param name="hasMoreResults">Indicates whether there are more
+        /// invoice sections than the ones listed in this collection. The
+        /// collection lists a maximum of 50 invoice sections. To get all
+        /// invoice sections, use the list invoice sections API.</param>
+        /// <param name="value">The invoice sections associated to the billing
+        /// profile.</param>
+        public InvoiceSectionsOnExpand(bool? hasMoreResults = default(bool?), IList<InvoiceSection> value = default(IList<InvoiceSection>))
+        {
+            HasMoreResults = hasMoreResults;
+            Value = value;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets indicates whether there are more invoice sections than the
+        /// ones listed in this collection. The collection lists a maximum of
+        /// 50 invoice sections. To get all invoice sections, use the list
+        /// invoice sections API.
+        /// </summary>
+        [JsonProperty(PropertyName = "hasMoreResults")]
+        public bool? HasMoreResults { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the invoice sections associated to the billing
+        /// profile.
+        /// </summary>
+        [JsonProperty(PropertyName = "value")]
+        public IList<InvoiceSection> Value { get; set; }
+
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceStatus.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceStatus.cs
index 3ed93022c0554..4a4bcaa725a27 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceStatus.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceStatus.cs
@@ -16,9 +16,8 @@ namespace Microsoft.Azure.Management.Billing.Models
     /// </summary>
     public static class InvoiceStatus
     {
-        public const string PastDue = "PastDue";
         public const string Due = "Due";
+        public const string OverDue = "OverDue";
         public const string Paid = "Paid";
-        public const string Void = "Void";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceType.cs
new file mode 100644
index 0000000000000..e6fa4d753a6c8
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceType.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for InvoiceType.
+    /// </summary>
+    public static class InvoiceType
+    {
+        public const string AzureService = "AzureService";
+        public const string AzureMarketplace = "AzureMarketplace";
+        public const string AzureSupport = "AzureSupport";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsUpdateHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadBillingSubscriptionInvoiceHeaders.cs
similarity index 75%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsUpdateHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadBillingSubscriptionInvoiceHeaders.cs
index acf6515b6a3d0..ae2853e38f549 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoiceSectionsUpdateHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadBillingSubscriptionInvoiceHeaders.cs
@@ -14,29 +14,29 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Update operation.
+    /// Defines headers for DownloadBillingSubscriptionInvoice operation.
     /// </summary>
-    public partial class InvoiceSectionsUpdateHeaders
+    public partial class InvoicesDownloadBillingSubscriptionInvoiceHeaders
     {
         /// <summary>
-        /// Initializes a new instance of the InvoiceSectionsUpdateHeaders
-        /// class.
+        /// Initializes a new instance of the
+        /// InvoicesDownloadBillingSubscriptionInvoiceHeaders class.
         /// </summary>
-        public InvoiceSectionsUpdateHeaders()
+        public InvoicesDownloadBillingSubscriptionInvoiceHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the InvoiceSectionsUpdateHeaders
-        /// class.
+        /// Initializes a new instance of the
+        /// InvoicesDownloadBillingSubscriptionInvoiceHeaders class.
         /// </summary>
         /// <param name="location">GET this URL to retrieve the status of the
         /// asynchronous operation.</param>
         /// <param name="retryAfter">The amount of delay to use while the
         /// status of the operation is checked. The value is expressed in
         /// seconds.</param>
-        public InvoiceSectionsUpdateHeaders(string location = default(string), string retryAfter = default(string))
+        public InvoicesDownloadBillingSubscriptionInvoiceHeaders(string location = default(string), string retryAfter = default(string))
         {
             Location = location;
             RetryAfter = retryAfter;
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesUpdateHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadInvoiceHeaders.cs
similarity index 80%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesUpdateHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadInvoiceHeaders.cs
index dd7e540152243..3f8c4a1ebf388 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/BillingProfilesUpdateHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/InvoicesDownloadInvoiceHeaders.cs
@@ -14,21 +14,21 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Update operation.
+    /// Defines headers for DownloadInvoice operation.
     /// </summary>
-    public partial class BillingProfilesUpdateHeaders
+    public partial class InvoicesDownloadInvoiceHeaders
     {
         /// <summary>
-        /// Initializes a new instance of the BillingProfilesUpdateHeaders
+        /// Initializes a new instance of the InvoicesDownloadInvoiceHeaders
         /// class.
         /// </summary>
-        public BillingProfilesUpdateHeaders()
+        public InvoicesDownloadInvoiceHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the BillingProfilesUpdateHeaders
+        /// Initializes a new instance of the InvoicesDownloadInvoiceHeaders
         /// class.
         /// </summary>
         /// <param name="location">GET this URL to retrieve the status of the
@@ -36,7 +36,7 @@ public BillingProfilesUpdateHeaders()
         /// <param name="retryAfter">The amount of delay to use while the
         /// status of the operation is checked. The value is expressed in
         /// seconds.</param>
-        public BillingProfilesUpdateHeaders(string location = default(string), string retryAfter = default(string))
+        public InvoicesDownloadInvoiceHeaders(string location = default(string), string retryAfter = default(string))
         {
             Location = location;
             RetryAfter = retryAfter;
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCredit.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCredit.cs
deleted file mode 100644
index 69722dbd54338..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/LineOfCredit.cs
+++ /dev/null
@@ -1,85 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Line of credit resource.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class LineOfCredit : Resource
-    {
-        /// <summary>
-        /// Initializes a new instance of the LineOfCredit class.
-        /// </summary>
-        public LineOfCredit()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the LineOfCredit class.
-        /// </summary>
-        /// <param name="id">Resource Id.</param>
-        /// <param name="name">Resource name.</param>
-        /// <param name="type">Resource type.</param>
-        /// <param name="creditLimit">The current credit limit.</param>
-        /// <param name="reason">The reason for the line of credit status when
-        /// not approved.</param>
-        /// <param name="remainingBalance">Remaining balance.</param>
-        /// <param name="status">The line of credit status. Possible values
-        /// include: 'Approved', 'Rejected'</param>
-        public LineOfCredit(string id = default(string), string name = default(string), string type = default(string), Amount creditLimit = default(Amount), string reason = default(string), Amount remainingBalance = default(Amount), string status = default(string))
-            : base(id, name, type)
-        {
-            CreditLimit = creditLimit;
-            Reason = reason;
-            RemainingBalance = remainingBalance;
-            Status = status;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the current credit limit.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.creditLimit")]
-        public Amount CreditLimit { get; set; }
-
-        /// <summary>
-        /// Gets the reason for the line of credit status when not approved.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.reason")]
-        public string Reason { get; private set; }
-
-        /// <summary>
-        /// Gets remaining balance.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.remainingBalance")]
-        public Amount RemainingBalance { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the line of credit status. Possible values include:
-        /// 'Approved', 'Rejected'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.status")]
-        public string Status { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/OperationDisplay.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/OperationDisplay.cs
index 41b4803e19cad..1fb0a8ab0c51c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/OperationDisplay.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/OperationDisplay.cs
@@ -30,10 +30,10 @@ public OperationDisplay()
         /// Initializes a new instance of the OperationDisplay class.
         /// </summary>
         /// <param name="provider">Service provider: Microsoft.Billing.</param>
-        /// <param name="resource">Resource on which the operation is
-        /// performed: Invoice, etc.</param>
-        /// <param name="operation">Operation type: Read, write, delete,
-        /// etc.</param>
+        /// <param name="resource">Resource on which the operation is performed
+        /// such as invoice and billing subscription.</param>
+        /// <param name="operation">Operation type such as read, write and
+        /// delete.</param>
         public OperationDisplay(string provider = default(string), string resource = default(string), string operation = default(string))
         {
             Provider = provider;
@@ -54,13 +54,14 @@ public OperationDisplay()
         public string Provider { get; private set; }
 
         /// <summary>
-        /// Gets resource on which the operation is performed: Invoice, etc.
+        /// Gets resource on which the operation is performed such as invoice
+        /// and billing subscription.
         /// </summary>
         [JsonProperty(PropertyName = "resource")]
         public string Resource { get; private set; }
 
         /// <summary>
-        /// Gets operation type: Read, write, delete, etc.
+        /// Gets operation type such as read, write and delete.
         /// </summary>
         [JsonProperty(PropertyName = "operation")]
         public string Operation { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Participants.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Participants.cs
index a5461b7cd5c0c..760f89ceb15ec 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Participants.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Participants.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Details about the participant or signer.
+    /// The details about a participant.
     /// </summary>
     public partial class Participants
     {
@@ -29,10 +29,11 @@ public Participants()
         /// <summary>
         /// Initializes a new instance of the Participants class.
         /// </summary>
-        /// <param name="status">The signing status</param>
-        /// <param name="statusDate">The date when status got changed.</param>
-        /// <param name="email">The email address of the participant or
-        /// signer.</param>
+        /// <param name="status">The acceptance status of the
+        /// participant.</param>
+        /// <param name="statusDate">The date when the status got
+        /// changed.</param>
+        /// <param name="email">The email address of the participant.</param>
         public Participants(string status = default(string), System.DateTime? statusDate = default(System.DateTime?), string email = default(string))
         {
             Status = status;
@@ -47,19 +48,19 @@ public Participants()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the signing status
+        /// Gets the acceptance status of the participant.
         /// </summary>
         [JsonProperty(PropertyName = "status")]
         public string Status { get; private set; }
 
         /// <summary>
-        /// Gets the date when status got changed.
+        /// Gets the date when the status got changed.
         /// </summary>
         [JsonProperty(PropertyName = "statusDate")]
         public System.DateTime? StatusDate { get; private set; }
 
         /// <summary>
-        /// Gets the email address of the participant or signer.
+        /// Gets the email address of the participant.
         /// </summary>
         [JsonProperty(PropertyName = "email")]
         public string Email { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethod.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethod.cs
deleted file mode 100644
index 02fb87d8c3d00..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentMethod.cs
+++ /dev/null
@@ -1,85 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// A payment method resource.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class PaymentMethod : Resource
-    {
-        /// <summary>
-        /// Initializes a new instance of the PaymentMethod class.
-        /// </summary>
-        public PaymentMethod()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the PaymentMethod class.
-        /// </summary>
-        /// <param name="id">Resource Id.</param>
-        /// <param name="name">Resource name.</param>
-        /// <param name="type">Resource type.</param>
-        /// <param name="paymentMethodType">Payment method type. Possible
-        /// values include: 'Credits', 'ChequeWire'</param>
-        /// <param name="details">Details about the payment method.</param>
-        /// <param name="expiration">Expiration month and year.</param>
-        /// <param name="currency">The currency associated with the payment
-        /// method.</param>
-        public PaymentMethod(string id = default(string), string name = default(string), string type = default(string), string paymentMethodType = default(string), string details = default(string), string expiration = default(string), string currency = default(string))
-            : base(id, name, type)
-        {
-            PaymentMethodType = paymentMethodType;
-            Details = details;
-            Expiration = expiration;
-            Currency = currency;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets payment method type. Possible values include:
-        /// 'Credits', 'ChequeWire'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.paymentMethodType")]
-        public string PaymentMethodType { get; set; }
-
-        /// <summary>
-        /// Gets details about the payment method.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.details")]
-        public string Details { get; private set; }
-
-        /// <summary>
-        /// Gets expiration month and year.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.expiration")]
-        public string Expiration { get; private set; }
-
-        /// <summary>
-        /// Gets the currency associated with the payment method.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.currency")]
-        public string Currency { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentProperties.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentProperties.cs
index a11d333f68025..ce8212f8a6afa 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentProperties.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PaymentProperties.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The properties of the payment.
+    /// The properties of a payment.
     /// </summary>
     public partial class PaymentProperties
     {
@@ -31,8 +31,8 @@ public PaymentProperties()
         /// </summary>
         /// <param name="paymentType">The type of payment.</param>
         /// <param name="amount">The paid amount.</param>
-        /// <param name="date">The date of the payment.</param>
-        /// <param name="paymentMethodFamily">The payment method family.
+        /// <param name="date">The date when the payment was made.</param>
+        /// <param name="paymentMethodFamily">The family of payment method.
         /// Possible values include: 'Credits', 'CheckWire', 'CreditCard',
         /// 'None'</param>
         /// <param name="paymentMethodType">The type of payment method.</param>
@@ -64,13 +64,13 @@ public PaymentProperties()
         public Amount Amount { get; private set; }
 
         /// <summary>
-        /// Gets the date of the payment.
+        /// Gets the date when the payment was made.
         /// </summary>
         [JsonProperty(PropertyName = "date")]
         public System.DateTime? Date { get; private set; }
 
         /// <summary>
-        /// Gets or sets the payment method family. Possible values include:
+        /// Gets or sets the family of payment method. Possible values include:
         /// 'Credits', 'CheckWire', 'CreditCard', 'None'
         /// </summary>
         [JsonProperty(PropertyName = "paymentMethodFamily")]
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Policy.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Policy.cs
index e402244f9f92d..09eb26d7da033 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Policy.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Policy.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// The Policy.
+    /// A policy.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Policy : Resource
@@ -35,14 +35,16 @@ public Policy()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="marketplacePurchases">The marketplace purchases are
-        /// free, allowed or not allowed. Possible values include:
-        /// 'AllAllowed', 'OnlyFreeAllowed', 'NotAllowed'</param>
-        /// <param name="reservationPurchases">The reservation purchases
-        /// allowed or not. Possible values include: 'Allowed',
+        /// <param name="marketplacePurchases">The policy that controls whether
+        /// Azure marketplace purchases are allowed for a billing profile.
+        /// Possible values include: 'AllAllowed', 'OnlyFreeAllowed',
         /// 'NotAllowed'</param>
-        /// <param name="viewCharges">Who can view charges. Possible values
-        /// include: 'Allowed', 'NotAllowed'</param>
+        /// <param name="reservationPurchases">The policy that controls whether
+        /// Azure reservation purchases are allowed for a billing profile.
+        /// Possible values include: 'Allowed', 'NotAllowed'</param>
+        /// <param name="viewCharges">The policy that controls whether users
+        /// with Azure RBAC access to a subscription can view its charges.
+        /// Possible values include: 'Allowed', 'NotAllowed'</param>
         public Policy(string id = default(string), string name = default(string), string type = default(string), string marketplacePurchases = default(string), string reservationPurchases = default(string), string viewCharges = default(string))
             : base(id, name, type)
         {
@@ -58,23 +60,25 @@ public Policy()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the marketplace purchases are free, allowed or not
-        /// allowed. Possible values include: 'AllAllowed', 'OnlyFreeAllowed',
-        /// 'NotAllowed'
+        /// Gets or sets the policy that controls whether Azure marketplace
+        /// purchases are allowed for a billing profile. Possible values
+        /// include: 'AllAllowed', 'OnlyFreeAllowed', 'NotAllowed'
         /// </summary>
         [JsonProperty(PropertyName = "properties.marketplacePurchases")]
         public string MarketplacePurchases { get; set; }
 
         /// <summary>
-        /// Gets or sets the reservation purchases allowed or not. Possible
-        /// values include: 'Allowed', 'NotAllowed'
+        /// Gets or sets the policy that controls whether Azure reservation
+        /// purchases are allowed for a billing profile. Possible values
+        /// include: 'Allowed', 'NotAllowed'
         /// </summary>
         [JsonProperty(PropertyName = "properties.reservationPurchases")]
         public string ReservationPurchases { get; set; }
 
         /// <summary>
-        /// Gets or sets who can view charges. Possible values include:
-        /// 'Allowed', 'NotAllowed'
+        /// Gets or sets the policy that controls whether users with Azure RBAC
+        /// access to a subscription can view its charges. Possible values
+        /// include: 'Allowed', 'NotAllowed'
         /// </summary>
         [JsonProperty(PropertyName = "properties.viewCharges")]
         public string ViewCharges { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadByBillingProfileHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadByBillingProfileHeaders.cs
deleted file mode 100644
index 47a7dd2a5b11c..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadByBillingProfileHeaders.cs
+++ /dev/null
@@ -1,74 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Defines headers for DownloadByBillingProfile operation.
-    /// </summary>
-    public partial class PriceSheetDownloadByBillingProfileHeaders
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// PriceSheetDownloadByBillingProfileHeaders class.
-        /// </summary>
-        public PriceSheetDownloadByBillingProfileHeaders()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// PriceSheetDownloadByBillingProfileHeaders class.
-        /// </summary>
-        /// <param name="location">GET this URL to retrieve the status of the
-        /// asynchronous operation.</param>
-        /// <param name="retryAfter">The amount of delay to use while the
-        /// status of the operation is checked. The value is expressed in
-        /// seconds.</param>
-        /// <param name="oDataEntityId">The operation entity Id GUID.</param>
-        public PriceSheetDownloadByBillingProfileHeaders(string location = default(string), string retryAfter = default(string), string oDataEntityId = default(string))
-        {
-            Location = location;
-            RetryAfter = retryAfter;
-            ODataEntityId = oDataEntityId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets GET this URL to retrieve the status of the
-        /// asynchronous operation.
-        /// </summary>
-        [JsonProperty(PropertyName = "Location")]
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the amount of delay to use while the status of the
-        /// operation is checked. The value is expressed in seconds.
-        /// </summary>
-        [JsonProperty(PropertyName = "Retry-After")]
-        public string RetryAfter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the operation entity Id GUID.
-        /// </summary>
-        [JsonProperty(PropertyName = "OData-EntityId")]
-        public string ODataEntityId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadHeaders.cs
deleted file mode 100644
index 29f758def14c2..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/PriceSheetDownloadHeaders.cs
+++ /dev/null
@@ -1,72 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Defines headers for Download operation.
-    /// </summary>
-    public partial class PriceSheetDownloadHeaders
-    {
-        /// <summary>
-        /// Initializes a new instance of the PriceSheetDownloadHeaders class.
-        /// </summary>
-        public PriceSheetDownloadHeaders()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the PriceSheetDownloadHeaders class.
-        /// </summary>
-        /// <param name="location">GET this URL to retrieve the status of the
-        /// asynchronous operation.</param>
-        /// <param name="retryAfter">The amount of delay to use while the
-        /// status of the operation is checked. The value is expressed in
-        /// seconds.</param>
-        /// <param name="oDataEntityId">The operation entity Id GUID.</param>
-        public PriceSheetDownloadHeaders(string location = default(string), string retryAfter = default(string), string oDataEntityId = default(string))
-        {
-            Location = location;
-            RetryAfter = retryAfter;
-            ODataEntityId = oDataEntityId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets GET this URL to retrieve the status of the
-        /// asynchronous operation.
-        /// </summary>
-        [JsonProperty(PropertyName = "Location")]
-        public string Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the amount of delay to use while the status of the
-        /// operation is checked. The value is expressed in seconds.
-        /// </summary>
-        [JsonProperty(PropertyName = "Retry-After")]
-        public string RetryAfter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the operation entity Id GUID.
-        /// </summary>
-        [JsonProperty(PropertyName = "OData-EntityId")]
-        public string ODataEntityId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Product.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Product.cs
index 8303f5c9e9a69..b32228ce453dd 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Product.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Product.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A product resource.
+    /// A product.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Product : Resource
@@ -35,39 +35,52 @@ public Product()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
+        /// <param name="autoRenew">Indicates whether auto renewal is turned on
+        /// or off for a product. Possible values include: 'Off', 'On'</param>
         /// <param name="displayName">The display name of the product.</param>
-        /// <param name="purchaseDate">The date of purchase.</param>
-        /// <param name="productTypeId">The product type id.</param>
-        /// <param name="productType">The type of product.</param>
-        /// <param name="status">Product status. Possible values include:
-        /// 'Active', 'Inactive', 'PastDue', 'Expiring', 'Expired', 'Disabled',
-        /// 'Cancelled', 'AutoRenew'</param>
-        /// <param name="endDate">end date.</param>
-        /// <param name="billingFrequency">Billing frequency. Possible values
-        /// include: 'OneTime', 'Monthly', 'UsageBased'</param>
-        /// <param name="lastCharge">Last month charges.</param>
+        /// <param name="purchaseDate">The date when the product was
+        /// purchased.</param>
+        /// <param name="productTypeId">The ID of the type of product.</param>
+        /// <param name="productType">The description of the type of
+        /// product.</param>
+        /// <param name="status">The current status of the product. Possible
+        /// values include: 'Active', 'Inactive', 'PastDue', 'Expiring',
+        /// 'Expired', 'Disabled', 'Cancelled', 'AutoRenew'</param>
+        /// <param name="endDate">The date when the product will be renewed or
+        /// canceled.</param>
+        /// <param name="billingFrequency">The frequency at which the product
+        /// will be billed. Possible values include: 'OneTime', 'Monthly',
+        /// 'UsageBased'</param>
+        /// <param name="lastCharge">The last month charges.</param>
         /// <param name="lastChargeDate">The date of the last charge.</param>
-        /// <param name="quantity">The purchased product quantity.</param>
-        /// <param name="skuId">Sku Id.</param>
-        /// <param name="skuDescription">Sku description.</param>
-        /// <param name="availabilityId">Availability Id.</param>
-        /// <param name="parentProductId">Parent Product Id.</param>
-        /// <param name="invoiceSectionId">Invoice section id to which this
-        /// product belongs.</param>
-        /// <param name="invoiceSectionDisplayName">Invoice section display
-        /// name to which this product belongs.</param>
-        /// <param name="billingProfileId">Billing Profile id to which this
-        /// product belongs.</param>
-        /// <param name="billingProfileDisplayName">Billing Profile display
-        /// name to which this product belongs.</param>
-        /// <param name="customerId">Customer id to which this product
-        /// belongs.</param>
-        /// <param name="customerDisplayName">Display name of customer to which
-        /// this product belongs.</param>
+        /// <param name="quantity">The quantity purchased for the
+        /// product.</param>
+        /// <param name="skuId">The sku ID of the product.</param>
+        /// <param name="skuDescription">The sku description of the
+        /// product.</param>
+        /// <param name="tenantId">The id of the tenant in which the product is
+        /// used.</param>
+        /// <param name="availabilityId">The availability of the
+        /// product.</param>
+        /// <param name="invoiceSectionId">The ID of the invoice section to
+        /// which the product is billed.</param>
+        /// <param name="invoiceSectionDisplayName">The name of the invoice
+        /// section to which the product is billed.</param>
+        /// <param name="billingProfileId">The ID of the billing profile to
+        /// which the product is billed.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile to which the product is billed.</param>
+        /// <param name="customerId">The ID of the customer for whom the
+        /// product was purchased. The field is applicable only for Microsoft
+        /// Partner Agreement billing account.</param>
+        /// <param name="customerDisplayName">The name of the customer for whom
+        /// the product was purchased. The field is applicable only for
+        /// Microsoft Partner Agreement billing account.</param>
         /// <param name="reseller">Reseller for this product.</param>
-        public Product(string id = default(string), string name = default(string), string type = default(string), string displayName = default(string), System.DateTime? purchaseDate = default(System.DateTime?), string productTypeId = default(string), string productType = default(string), string status = default(string), System.DateTime? endDate = default(System.DateTime?), string billingFrequency = default(string), Amount lastCharge = default(Amount), System.DateTime? lastChargeDate = default(System.DateTime?), double? quantity = default(double?), string skuId = default(string), string skuDescription = default(string), string availabilityId = default(string), string parentProductId = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string customerId = default(string), string customerDisplayName = default(string), Reseller reseller = default(Reseller))
+        public Product(string id = default(string), string name = default(string), string type = default(string), string autoRenew = default(string), string displayName = default(string), System.DateTime? purchaseDate = default(System.DateTime?), string productTypeId = default(string), string productType = default(string), string status = default(string), System.DateTime? endDate = default(System.DateTime?), string billingFrequency = default(string), Amount lastCharge = default(Amount), System.DateTime? lastChargeDate = default(System.DateTime?), double? quantity = default(double?), string skuId = default(string), string skuDescription = default(string), string tenantId = default(string), string availabilityId = default(string), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string customerId = default(string), string customerDisplayName = default(string), Reseller reseller = default(Reseller))
             : base(id, name, type)
         {
+            AutoRenew = autoRenew;
             DisplayName = displayName;
             PurchaseDate = purchaseDate;
             ProductTypeId = productTypeId;
@@ -80,8 +93,8 @@ public Product()
             Quantity = quantity;
             SkuId = skuId;
             SkuDescription = skuDescription;
+            TenantId = tenantId;
             AvailabilityId = availabilityId;
-            ParentProductId = parentProductId;
             InvoiceSectionId = invoiceSectionId;
             InvoiceSectionDisplayName = invoiceSectionDisplayName;
             BillingProfileId = billingProfileId;
@@ -97,6 +110,13 @@ public Product()
         /// </summary>
         partial void CustomInit();
 
+        /// <summary>
+        /// Gets or sets indicates whether auto renewal is turned on or off for
+        /// a product. Possible values include: 'Off', 'On'
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.autoRenew")]
+        public string AutoRenew { get; set; }
+
         /// <summary>
         /// Gets the display name of the product.
         /// </summary>
@@ -104,46 +124,46 @@ public Product()
         public string DisplayName { get; private set; }
 
         /// <summary>
-        /// Gets the date of purchase.
+        /// Gets the date when the product was purchased.
         /// </summary>
         [JsonProperty(PropertyName = "properties.purchaseDate")]
         public System.DateTime? PurchaseDate { get; private set; }
 
         /// <summary>
-        /// Gets the product type id.
+        /// Gets the ID of the type of product.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productTypeId")]
         public string ProductTypeId { get; private set; }
 
         /// <summary>
-        /// Gets the type of product.
+        /// Gets the description of the type of product.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productType")]
         public string ProductType { get; private set; }
 
         /// <summary>
-        /// Gets or sets product status. Possible values include: 'Active',
-        /// 'Inactive', 'PastDue', 'Expiring', 'Expired', 'Disabled',
-        /// 'Cancelled', 'AutoRenew'
+        /// Gets or sets the current status of the product. Possible values
+        /// include: 'Active', 'Inactive', 'PastDue', 'Expiring', 'Expired',
+        /// 'Disabled', 'Cancelled', 'AutoRenew'
         /// </summary>
         [JsonProperty(PropertyName = "properties.status")]
         public string Status { get; set; }
 
         /// <summary>
-        /// Gets end date.
+        /// Gets the date when the product will be renewed or canceled.
         /// </summary>
         [JsonProperty(PropertyName = "properties.endDate")]
         public System.DateTime? EndDate { get; private set; }
 
         /// <summary>
-        /// Gets or sets billing frequency. Possible values include: 'OneTime',
-        /// 'Monthly', 'UsageBased'
+        /// Gets or sets the frequency at which the product will be billed.
+        /// Possible values include: 'OneTime', 'Monthly', 'UsageBased'
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingFrequency")]
         public string BillingFrequency { get; set; }
 
         /// <summary>
-        /// Gets last month charges.
+        /// Gets the last month charges.
         /// </summary>
         [JsonProperty(PropertyName = "properties.lastCharge")]
         public Amount LastCharge { get; private set; }
@@ -155,67 +175,73 @@ public Product()
         public System.DateTime? LastChargeDate { get; private set; }
 
         /// <summary>
-        /// Gets the purchased product quantity.
+        /// Gets the quantity purchased for the product.
         /// </summary>
         [JsonProperty(PropertyName = "properties.quantity")]
         public double? Quantity { get; private set; }
 
         /// <summary>
-        /// Gets sku Id.
+        /// Gets the sku ID of the product.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuId")]
         public string SkuId { get; private set; }
 
         /// <summary>
-        /// Gets sku description.
+        /// Gets the sku description of the product.
         /// </summary>
         [JsonProperty(PropertyName = "properties.skuDescription")]
         public string SkuDescription { get; private set; }
 
         /// <summary>
-        /// Gets availability Id.
+        /// Gets the id of the tenant in which the product is used.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.availabilityId")]
-        public string AvailabilityId { get; private set; }
+        [JsonProperty(PropertyName = "properties.tenantId")]
+        public string TenantId { get; private set; }
 
         /// <summary>
-        /// Gets parent Product Id.
+        /// Gets the availability of the product.
         /// </summary>
-        [JsonProperty(PropertyName = "properties.parentProductId")]
-        public string ParentProductId { get; private set; }
+        [JsonProperty(PropertyName = "properties.availabilityId")]
+        public string AvailabilityId { get; private set; }
 
         /// <summary>
-        /// Gets invoice section id to which this product belongs.
+        /// Gets the ID of the invoice section to which the product is billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionId")]
         public string InvoiceSectionId { get; private set; }
 
         /// <summary>
-        /// Gets invoice section display name to which this product belongs.
+        /// Gets the name of the invoice section to which the product is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionDisplayName")]
         public string InvoiceSectionDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile id to which this product belongs.
+        /// Gets the ID of the billing profile to which the product is billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile display name to which this product belongs.
+        /// Gets the name of the billing profile to which the product is
+        /// billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets customer id to which this product belongs.
+        /// Gets the ID of the customer for whom the product was purchased. The
+        /// field is applicable only for Microsoft Partner Agreement billing
+        /// account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerId")]
         public string CustomerId { get; private set; }
 
         /// <summary>
-        /// Gets display name of customer to which this product belongs.
+        /// Gets the name of the customer for whom the product was purchased.
+        /// The field is applicable only for Microsoft Partner Agreement
+        /// billing account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerDisplayName")]
         public string CustomerDisplayName { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductDetails.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductDetails.cs
deleted file mode 100644
index 2ee4ec23bc1a3..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductDetails.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Details of the product to be transferred.
-    /// </summary>
-    public partial class ProductDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the ProductDetails class.
-        /// </summary>
-        public ProductDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ProductDetails class.
-        /// </summary>
-        /// <param name="productType">Type of the product to be transferred.
-        /// Possible values include: 'AzureSubscription',
-        /// 'AzureReservation'</param>
-        /// <param name="productId">Id of product to be transferred.</param>
-        public ProductDetails(string productType = default(string), string productId = default(string))
-        {
-            ProductType = productType;
-            ProductId = productId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets type of the product to be transferred. Possible values
-        /// include: 'AzureSubscription', 'AzureReservation'
-        /// </summary>
-        [JsonProperty(PropertyName = "productType")]
-        public string ProductType { get; set; }
-
-        /// <summary>
-        /// Gets or sets id of product to be transferred.
-        /// </summary>
-        [JsonProperty(PropertyName = "productId")]
-        public string ProductId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsListResult.cs
deleted file mode 100644
index 90a6ed7c54f02..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsListResult.cs
+++ /dev/null
@@ -1,63 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing products. It contains a list of available products
-    /// summaries in reverse chronological order by purchase date.
-    /// </summary>
-    public partial class ProductsListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the ProductsListResult class.
-        /// </summary>
-        public ProductsListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ProductsListResult class.
-        /// </summary>
-        /// <param name="value">The list of products.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public ProductsListResult(IList<Product> value = default(IList<Product>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of products.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<Product> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsTransferHeaders.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsMoveHeaders.cs
similarity index 64%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsTransferHeaders.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsMoveHeaders.cs
index 2440f6d2f2f09..ace8ee2e077c3 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsTransferHeaders.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductsMoveHeaders.cs
@@ -14,25 +14,26 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Defines headers for Transfer operation.
+    /// Defines headers for Move operation.
     /// </summary>
-    public partial class ProductsTransferHeaders
+    public partial class ProductsMoveHeaders
     {
         /// <summary>
-        /// Initializes a new instance of the ProductsTransferHeaders class.
+        /// Initializes a new instance of the ProductsMoveHeaders class.
         /// </summary>
-        public ProductsTransferHeaders()
+        public ProductsMoveHeaders()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the ProductsTransferHeaders class.
+        /// Initializes a new instance of the ProductsMoveHeaders class.
         /// </summary>
         /// <param name="location">Location URI to poll for result</param>
-        /// <param name="retryAfter">Recommends the retryable time after
-        /// receiving this.</param>
-        public ProductsTransferHeaders(string location = default(string), int? retryAfter = default(int?))
+        /// <param name="retryAfter">Recommended time to wait before making
+        /// another request to check the status of the operation. The time is
+        /// specified in seconds.</param>
+        public ProductsMoveHeaders(string location = default(string), int? retryAfter = default(int?))
         {
             Location = location;
             RetryAfter = retryAfter;
@@ -51,7 +52,9 @@ public ProductsTransferHeaders()
         public string Location { get; set; }
 
         /// <summary>
-        /// Gets or sets recommends the retryable time after receiving this.
+        /// Gets or sets recommended time to wait before making another request
+        /// to check the status of the operation. The time is specified in
+        /// seconds.
         /// </summary>
         [JsonProperty(PropertyName = "Retry-After")]
         public int? RetryAfter { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/RecipientTransferDetails.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/RecipientTransferDetails.cs
deleted file mode 100644
index c4dddcb9ca961..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/RecipientTransferDetails.cs
+++ /dev/null
@@ -1,155 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Details of the transfer.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class RecipientTransferDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the RecipientTransferDetails class.
-        /// </summary>
-        public RecipientTransferDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the RecipientTransferDetails class.
-        /// </summary>
-        /// <param name="creationTime">Transfer creation time.</param>
-        /// <param name="expirationTime">Transfer expiration time.</param>
-        /// <param name="allowedProductType">Type of subscriptions that can be
-        /// transferred.</param>
-        /// <param name="transferStatus">Overall transfer status. Possible
-        /// values include: 'Pending', 'InProgress', 'Completed',
-        /// 'CompletedWithErrors', 'Failed', 'Canceled', 'Declined'</param>
-        /// <param name="recipientEmailId">Email Id of recipient of
-        /// transfer.</param>
-        /// <param name="initiatorEmailId">Email Id of initiator of
-        /// transfer.</param>
-        /// <param name="resellerId">Reseller Id for transfer.</param>
-        /// <param name="resellerName">Reseller name for transfer.</param>
-        /// <param name="initiatorCustomerType">Customer type of the
-        /// initiator.</param>
-        /// <param name="canceledBy">Email Id who user canceled the
-        /// transfer.</param>
-        /// <param name="lastModifiedTime">Transfer last modification
-        /// time.</param>
-        /// <param name="detailedTransferStatus">Detailed transfer
-        /// status.</param>
-        public RecipientTransferDetails(System.DateTime? creationTime = default(System.DateTime?), System.DateTime? expirationTime = default(System.DateTime?), IList<string> allowedProductType = default(IList<string>), string transferStatus = default(string), string recipientEmailId = default(string), string initiatorEmailId = default(string), string resellerId = default(string), string resellerName = default(string), string initiatorCustomerType = default(string), string canceledBy = default(string), System.DateTime? lastModifiedTime = default(System.DateTime?), IList<DetailedTransferStatus> detailedTransferStatus = default(IList<DetailedTransferStatus>))
-        {
-            CreationTime = creationTime;
-            ExpirationTime = expirationTime;
-            AllowedProductType = allowedProductType;
-            TransferStatus = transferStatus;
-            RecipientEmailId = recipientEmailId;
-            InitiatorEmailId = initiatorEmailId;
-            ResellerId = resellerId;
-            ResellerName = resellerName;
-            InitiatorCustomerType = initiatorCustomerType;
-            CanceledBy = canceledBy;
-            LastModifiedTime = lastModifiedTime;
-            DetailedTransferStatus = detailedTransferStatus;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets transfer creation time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.creationTime")]
-        public System.DateTime? CreationTime { get; private set; }
-
-        /// <summary>
-        /// Gets transfer expiration time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.expirationTime")]
-        public System.DateTime? ExpirationTime { get; private set; }
-
-        /// <summary>
-        /// Gets type of subscriptions that can be transferred.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.allowedProductType")]
-        public IList<string> AllowedProductType { get; private set; }
-
-        /// <summary>
-        /// Gets overall transfer status. Possible values include: 'Pending',
-        /// 'InProgress', 'Completed', 'CompletedWithErrors', 'Failed',
-        /// 'Canceled', 'Declined'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.transferStatus")]
-        public string TransferStatus { get; private set; }
-
-        /// <summary>
-        /// Gets email Id of recipient of transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.recipientEmailId")]
-        public string RecipientEmailId { get; private set; }
-
-        /// <summary>
-        /// Gets email Id of initiator of transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.initiatorEmailId")]
-        public string InitiatorEmailId { get; private set; }
-
-        /// <summary>
-        /// Gets reseller Id for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.resellerId")]
-        public string ResellerId { get; private set; }
-
-        /// <summary>
-        /// Gets reseller name for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.resellerName")]
-        public string ResellerName { get; private set; }
-
-        /// <summary>
-        /// Gets customer type of the initiator.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.initiatorCustomerType")]
-        public string InitiatorCustomerType { get; private set; }
-
-        /// <summary>
-        /// Gets email Id who user canceled the transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.canceledBy")]
-        public string CanceledBy { get; private set; }
-
-        /// <summary>
-        /// Gets transfer last modification time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.lastModifiedTime")]
-        public System.DateTime? LastModifiedTime { get; private set; }
-
-        /// <summary>
-        /// Gets detailed transfer status.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.detailedTransferStatus")]
-        public IList<DetailedTransferStatus> DetailedTransferStatus { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Reseller.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Reseller.cs
index 5efc6c6fcde2d..c29c43f43865c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Reseller.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Reseller.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// Details about a reseller.
+    /// Details of the reseller.
     /// </summary>
     public partial class Reseller
     {
@@ -29,8 +29,8 @@ public Reseller()
         /// <summary>
         /// Initializes a new instance of the Reseller class.
         /// </summary>
-        /// <param name="resellerId">The reseller id.</param>
-        /// <param name="description">A description of the reseller.</param>
+        /// <param name="resellerId">The MPN ID of the reseller.</param>
+        /// <param name="description">The name of the reseller.</param>
         public Reseller(string resellerId = default(string), string description = default(string))
         {
             ResellerId = resellerId;
@@ -44,13 +44,13 @@ public Reseller()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets the reseller id.
+        /// Gets the MPN ID of the reseller.
         /// </summary>
         [JsonProperty(PropertyName = "resellerId")]
         public string ResellerId { get; private set; }
 
         /// <summary>
-        /// Gets a description of the reseller.
+        /// Gets the name of the reseller.
         /// </summary>
         [JsonProperty(PropertyName = "description")]
         public string Description { get; private set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductType.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimit.cs
similarity index 68%
rename from sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductType.cs
rename to sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimit.cs
index 2b308a955dbfc..9c110280d1f3c 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ProductType.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimit.cs
@@ -12,11 +12,11 @@ namespace Microsoft.Azure.Management.Billing.Models
 {
 
     /// <summary>
-    /// Defines values for ProductType.
+    /// Defines values for SpendingLimit.
     /// </summary>
-    public static class ProductType
+    public static class SpendingLimit
     {
-        public const string AzureSubscription = "AzureSubscription";
-        public const string AzureReservation = "AzureReservation";
+        public const string Off = "Off";
+        public const string On = "On";
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimitForBillingProfile.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimitForBillingProfile.cs
new file mode 100644
index 0000000000000..24ac4ee58ff5c
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/SpendingLimitForBillingProfile.cs
@@ -0,0 +1,22 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for SpendingLimitForBillingProfile.
+    /// </summary>
+    public static class SpendingLimitForBillingProfile
+    {
+        public const string Off = "Off";
+        public const string On = "On";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCode.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCode.cs
new file mode 100644
index 0000000000000..b91f5b60e789f
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCode.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for StatusReasonCode.
+    /// </summary>
+    public static class StatusReasonCode
+    {
+        public const string PastDue = "PastDue";
+        public const string SpendingLimitReached = "SpendingLimitReached";
+        public const string SpendingLimitExpired = "SpendingLimitExpired";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCodeForBillingProfile.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCodeForBillingProfile.cs
new file mode 100644
index 0000000000000..dcecf204daac7
--- /dev/null
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/StatusReasonCodeForBillingProfile.cs
@@ -0,0 +1,23 @@
+// <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.Billing.Models
+{
+
+    /// <summary>
+    /// Defines values for StatusReasonCodeForBillingProfile.
+    /// </summary>
+    public static class StatusReasonCodeForBillingProfile
+    {
+        public const string PastDue = "PastDue";
+        public const string SpendingLimitReached = "SpendingLimitReached";
+        public const string SpendingLimitExpired = "SpendingLimitExpired";
+    }
+}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Transaction.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Transaction.cs
index 41adddc53beee..f89628991bb97 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Transaction.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/Transaction.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Azure.Management.Billing.Models
     using System.Linq;
 
     /// <summary>
-    /// A reservation transaction resource.
+    /// A transaction.
     /// </summary>
     [Rest.Serialization.JsonTransformation]
     public partial class Transaction : Resource
@@ -35,42 +35,91 @@ public Transaction()
         /// <param name="id">Resource Id.</param>
         /// <param name="name">Resource name.</param>
         /// <param name="type">Resource type.</param>
-        /// <param name="kind">The kind of transaction. Choices are all and
+        /// <param name="kind">The kind of transaction. Options are all or
         /// reservation. Possible values include: 'all', 'reservation'</param>
-        /// <param name="date">The date of reservation transaction.</param>
-        /// <param name="invoice">Invoice number or 'pending' if not
-        /// invoiced.</param>
-        /// <param name="orderId">The reservation order id.</param>
-        /// <param name="orderName">The reservation order name.</param>
-        /// <param name="productFamily">The product family.</param>
-        /// <param name="productTypeId">The product type id.</param>
-        /// <param name="productType">The type of product.</param>
-        /// <param name="productDescription">Product description.</param>
-        /// <param name="transactionType">Transaction types. Possible values
-        /// include: 'Purchase', 'Usage Charge'</param>
-        /// <param name="transactionAmount">Last charge associated with the
-        /// purchase.</param>
-        /// <param name="quantity">Purchase quantity.</param>
-        /// <param name="invoiceSectionId">Invoice section id to which this
-        /// product belongs.</param>
-        /// <param name="invoiceSectionDisplayName">Invoice section display
-        /// name to which this product belongs.</param>
-        /// <param name="billingProfileId">Billing Profile id to which this
-        /// product belongs.</param>
-        /// <param name="billingProfileDisplayName">Billing Profile display
-        /// name to which this product belongs.</param>
-        /// <param name="customerId">Customer id to which this product
-        /// belongs.</param>
-        /// <param name="customerDisplayName">Display name of customer to which
-        /// this product belongs.</param>
-        /// <param name="subscriptionId">The subscription id.</param>
-        /// <param name="subscriptionName">The subscription name.</param>
-        public Transaction(string id = default(string), string name = default(string), string type = default(string), string kind = default(string), System.DateTime? date = default(System.DateTime?), string invoice = default(string), string orderId = default(string), string orderName = default(string), string productFamily = default(string), string productTypeId = default(string), string productType = default(string), string productDescription = default(string), string transactionType = default(string), Amount transactionAmount = default(Amount), int? quantity = default(int?), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string customerId = default(string), string customerDisplayName = default(string), string subscriptionId = default(string), string subscriptionName = default(string))
+        /// <param name="date">The date of transaction.</param>
+        /// <param name="invoice">Invoice on which the transaction was billed
+        /// or 'pending' if the transaction is not billed.</param>
+        /// <param name="invoiceId">The ID of the invoice on which the
+        /// transaction was billed. This field is only applicable for
+        /// transactions which are billed.</param>
+        /// <param name="orderId">The order ID of the reservation. The field is
+        /// only applicable for transaction of kind reservation.</param>
+        /// <param name="orderName">The name of the reservation order. The
+        /// field is only applicable for transactions of kind
+        /// reservation.</param>
+        /// <param name="productFamily">The family of the product for which the
+        /// transaction took place.</param>
+        /// <param name="productTypeId">The ID of the product type for which
+        /// the transaction took place.</param>
+        /// <param name="productType">The type of the product for which the
+        /// transaction took place.</param>
+        /// <param name="productDescription">The description of the product for
+        /// which the transaction took place.</param>
+        /// <param name="transactionType">The type of transaction. Possible
+        /// values include: 'Purchase', 'Usage Charge'</param>
+        /// <param name="transactionAmount">The charge associated with the
+        /// transaction.</param>
+        /// <param name="quantity">The quantity purchased in the
+        /// transaction.</param>
+        /// <param name="invoiceSectionId">The ID of the invoice section which
+        /// will be billed for the transaction.</param>
+        /// <param name="invoiceSectionDisplayName">The name of the invoice
+        /// section which will be billed for the transaction.</param>
+        /// <param name="billingProfileId">The ID of the billing profile which
+        /// will be billed for the transaction.</param>
+        /// <param name="billingProfileDisplayName">The name of the billing
+        /// profile which will be billed for the transaction.</param>
+        /// <param name="customerId">The ID of the customer for which the
+        /// transaction took place. The field is applicable only for Microsoft
+        /// Partner Agreement billing account.</param>
+        /// <param name="customerDisplayName">The name of the customer for
+        /// which the transaction took place. The field is applicable only for
+        /// Microsoft Partner Agreement billing account.</param>
+        /// <param name="subscriptionId">The ID of the subscription that was
+        /// used for the transaction. The field is only applicable for
+        /// transaction of kind reservation.</param>
+        /// <param name="subscriptionName">The name of the subscription that
+        /// was used for the transaction. The field is only applicable for
+        /// transaction of kind reservation.</param>
+        /// <param name="azurePlan">The type of azure plan of the subscription
+        /// that was used for the transaction.</param>
+        /// <param name="azureCreditApplied">The amount of any Azure credits
+        /// automatically applied to this transaction.</param>
+        /// <param name="billingCurrency">The ISO 4217 code for the currency in
+        /// which this transaction is billed.</param>
+        /// <param name="discount">The percentage discount, if any, applied to
+        /// this transaction.</param>
+        /// <param name="effectivePrice">The price of the product after
+        /// applying any discounts.</param>
+        /// <param name="exchangeRate">The exchange rate used to convert
+        /// charged amount to billing currency, if applicable.</param>
+        /// <param name="marketPrice">The retail price of the product.</param>
+        /// <param name="pricingCurrency">The ISO 4217 code for the currency in
+        /// which the product is priced.</param>
+        /// <param name="servicePeriodStartDate">The date of the purchase of
+        /// the product, or the start date of the month in which usage
+        /// started.</param>
+        /// <param name="servicePeriodEndDate">The end date of the product
+        /// term, or the end date of the month in which usage ended.</param>
+        /// <param name="subTotal">The pre-tax charged amount for the
+        /// transaction.</param>
+        /// <param name="tax">The tax amount applied to the
+        /// transaction.</param>
+        /// <param name="unitOfMeasure">The unit of measure used to bill for
+        /// the product. For example, compute services are billed per
+        /// hour.</param>
+        /// <param name="units">The number of units used for a given
+        /// product.</param>
+        /// <param name="unitType">The description for the unit of measure for
+        /// a given product.</param>
+        public Transaction(string id = default(string), string name = default(string), string type = default(string), string kind = default(string), System.DateTime? date = default(System.DateTime?), string invoice = default(string), string invoiceId = default(string), string orderId = default(string), string orderName = default(string), string productFamily = default(string), string productTypeId = default(string), string productType = default(string), string productDescription = default(string), string transactionType = default(string), Amount transactionAmount = default(Amount), int? quantity = default(int?), string invoiceSectionId = default(string), string invoiceSectionDisplayName = default(string), string billingProfileId = default(string), string billingProfileDisplayName = default(string), string customerId = default(string), string customerDisplayName = default(string), string subscriptionId = default(string), string subscriptionName = default(string), string azurePlan = default(string), Amount azureCreditApplied = default(Amount), string billingCurrency = default(string), double? discount = default(double?), Amount effectivePrice = default(Amount), double? exchangeRate = default(double?), Amount marketPrice = default(Amount), string pricingCurrency = default(string), System.DateTime? servicePeriodStartDate = default(System.DateTime?), System.DateTime? servicePeriodEndDate = default(System.DateTime?), Amount subTotal = default(Amount), Amount tax = default(Amount), string unitOfMeasure = default(string), double? units = default(double?), string unitType = default(string))
             : base(id, name, type)
         {
             Kind = kind;
             Date = date;
             Invoice = invoice;
+            InvoiceId = invoiceId;
             OrderId = orderId;
             OrderName = orderName;
             ProductFamily = productFamily;
@@ -88,6 +137,21 @@ public Transaction()
             CustomerDisplayName = customerDisplayName;
             SubscriptionId = subscriptionId;
             SubscriptionName = subscriptionName;
+            AzurePlan = azurePlan;
+            AzureCreditApplied = azureCreditApplied;
+            BillingCurrency = billingCurrency;
+            Discount = discount;
+            EffectivePrice = effectivePrice;
+            ExchangeRate = exchangeRate;
+            MarketPrice = marketPrice;
+            PricingCurrency = pricingCurrency;
+            ServicePeriodStartDate = servicePeriodStartDate;
+            ServicePeriodEndDate = servicePeriodEndDate;
+            SubTotal = subTotal;
+            Tax = tax;
+            UnitOfMeasure = unitOfMeasure;
+            Units = units;
+            UnitType = unitType;
             CustomInit();
         }
 
@@ -97,126 +161,248 @@ public Transaction()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets or sets the kind of transaction. Choices are all and
+        /// Gets or sets the kind of transaction. Options are all or
         /// reservation. Possible values include: 'all', 'reservation'
         /// </summary>
         [JsonProperty(PropertyName = "properties.kind")]
         public string Kind { get; set; }
 
         /// <summary>
-        /// Gets the date of reservation transaction.
+        /// Gets the date of transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.date")]
         public System.DateTime? Date { get; private set; }
 
         /// <summary>
-        /// Gets invoice number or 'pending' if not invoiced.
+        /// Gets invoice on which the transaction was billed or 'pending' if
+        /// the transaction is not billed.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoice")]
         public string Invoice { get; private set; }
 
         /// <summary>
-        /// Gets the reservation order id.
+        /// Gets the ID of the invoice on which the transaction was billed.
+        /// This field is only applicable for transactions which are billed.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.invoiceId")]
+        public string InvoiceId { get; private set; }
+
+        /// <summary>
+        /// Gets the order ID of the reservation. The field is only applicable
+        /// for transaction of kind reservation.
         /// </summary>
         [JsonProperty(PropertyName = "properties.orderId")]
         public string OrderId { get; private set; }
 
         /// <summary>
-        /// Gets the reservation order name.
+        /// Gets the name of the reservation order. The field is only
+        /// applicable for transactions of kind reservation.
         /// </summary>
         [JsonProperty(PropertyName = "properties.orderName")]
         public string OrderName { get; private set; }
 
         /// <summary>
-        /// Gets the product family.
+        /// Gets the family of the product for which the transaction took
+        /// place.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productFamily")]
         public string ProductFamily { get; private set; }
 
         /// <summary>
-        /// Gets the product type id.
+        /// Gets the ID of the product type for which the transaction took
+        /// place.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productTypeId")]
         public string ProductTypeId { get; private set; }
 
         /// <summary>
-        /// Gets the type of product.
+        /// Gets the type of the product for which the transaction took place.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productType")]
         public string ProductType { get; private set; }
 
         /// <summary>
-        /// Gets product description.
+        /// Gets the description of the product for which the transaction took
+        /// place.
         /// </summary>
         [JsonProperty(PropertyName = "properties.productDescription")]
         public string ProductDescription { get; private set; }
 
         /// <summary>
-        /// Gets or sets transaction types. Possible values include:
+        /// Gets or sets the type of transaction. Possible values include:
         /// 'Purchase', 'Usage Charge'
         /// </summary>
         [JsonProperty(PropertyName = "properties.transactionType")]
         public string TransactionType { get; set; }
 
         /// <summary>
-        /// Gets last charge associated with the purchase.
+        /// Gets the charge associated with the transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.transactionAmount")]
         public Amount TransactionAmount { get; private set; }
 
         /// <summary>
-        /// Gets purchase quantity.
+        /// Gets the quantity purchased in the transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.quantity")]
         public int? Quantity { get; private set; }
 
         /// <summary>
-        /// Gets invoice section id to which this product belongs.
+        /// Gets the ID of the invoice section which will be billed for the
+        /// transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionId")]
         public string InvoiceSectionId { get; private set; }
 
         /// <summary>
-        /// Gets invoice section display name to which this product belongs.
+        /// Gets the name of the invoice section which will be billed for the
+        /// transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.invoiceSectionDisplayName")]
         public string InvoiceSectionDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile id to which this product belongs.
+        /// Gets the ID of the billing profile which will be billed for the
+        /// transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileId")]
         public string BillingProfileId { get; private set; }
 
         /// <summary>
-        /// Gets billing Profile display name to which this product belongs.
+        /// Gets the name of the billing profile which will be billed for the
+        /// transaction.
         /// </summary>
         [JsonProperty(PropertyName = "properties.billingProfileDisplayName")]
         public string BillingProfileDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets customer id to which this product belongs.
+        /// Gets the ID of the customer for which the transaction took place.
+        /// The field is applicable only for Microsoft Partner Agreement
+        /// billing account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerId")]
         public string CustomerId { get; private set; }
 
         /// <summary>
-        /// Gets display name of customer to which this product belongs.
+        /// Gets the name of the customer for which the transaction took place.
+        /// The field is applicable only for Microsoft Partner Agreement
+        /// billing account.
         /// </summary>
         [JsonProperty(PropertyName = "properties.customerDisplayName")]
         public string CustomerDisplayName { get; private set; }
 
         /// <summary>
-        /// Gets the subscription id.
+        /// Gets the ID of the subscription that was used for the transaction.
+        /// The field is only applicable for transaction of kind reservation.
         /// </summary>
         [JsonProperty(PropertyName = "properties.subscriptionId")]
         public string SubscriptionId { get; private set; }
 
         /// <summary>
-        /// Gets the subscription name.
+        /// Gets the name of the subscription that was used for the
+        /// transaction. The field is only applicable for transaction of kind
+        /// reservation.
         /// </summary>
         [JsonProperty(PropertyName = "properties.subscriptionName")]
         public string SubscriptionName { get; private set; }
 
+        /// <summary>
+        /// Gets the type of azure plan of the subscription that was used for
+        /// the transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.azurePlan")]
+        public string AzurePlan { get; private set; }
+
+        /// <summary>
+        /// Gets the amount of any Azure credits automatically applied to this
+        /// transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.azureCreditApplied")]
+        public Amount AzureCreditApplied { get; private set; }
+
+        /// <summary>
+        /// Gets the ISO 4217 code for the currency in which this transaction
+        /// is billed.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.billingCurrency")]
+        public string BillingCurrency { get; private set; }
+
+        /// <summary>
+        /// Gets the percentage discount, if any, applied to this transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.discount")]
+        public double? Discount { get; private set; }
+
+        /// <summary>
+        /// Gets the price of the product after applying any discounts.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.effectivePrice")]
+        public Amount EffectivePrice { get; private set; }
+
+        /// <summary>
+        /// Gets the exchange rate used to convert charged amount to billing
+        /// currency, if applicable.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.exchangeRate")]
+        public double? ExchangeRate { get; private set; }
+
+        /// <summary>
+        /// Gets the retail price of the product.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.marketPrice")]
+        public Amount MarketPrice { get; private set; }
+
+        /// <summary>
+        /// Gets the ISO 4217 code for the currency in which the product is
+        /// priced.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.pricingCurrency")]
+        public string PricingCurrency { get; private set; }
+
+        /// <summary>
+        /// Gets the date of the purchase of the product, or the start date of
+        /// the month in which usage started.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.servicePeriodStartDate")]
+        public System.DateTime? ServicePeriodStartDate { get; private set; }
+
+        /// <summary>
+        /// Gets the end date of the product term, or the end date of the month
+        /// in which usage ended.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.servicePeriodEndDate")]
+        public System.DateTime? ServicePeriodEndDate { get; private set; }
+
+        /// <summary>
+        /// Gets the pre-tax charged amount for the transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.subTotal")]
+        public Amount SubTotal { get; private set; }
+
+        /// <summary>
+        /// Gets the tax amount applied to the transaction.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.tax")]
+        public Amount Tax { get; private set; }
+
+        /// <summary>
+        /// Gets the unit of measure used to bill for the product. For example,
+        /// compute services are billed per hour.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.unitOfMeasure")]
+        public string UnitOfMeasure { get; private set; }
+
+        /// <summary>
+        /// Gets the number of units used for a given product.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.units")]
+        public double? Units { get; private set; }
+
+        /// <summary>
+        /// Gets the description for the unit of measure for a given product.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.unitType")]
+        public string UnitType { get; private set; }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransactionListResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransactionListResult.cs
deleted file mode 100644
index b38f7aa05616f..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransactionListResult.cs
+++ /dev/null
@@ -1,62 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of listing reservation transactions.
-    /// </summary>
-    public partial class TransactionListResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the TransactionListResult class.
-        /// </summary>
-        public TransactionListResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TransactionListResult class.
-        /// </summary>
-        /// <param name="value">The list of reservation transactions.</param>
-        /// <param name="nextLink">The link (url) to the next page of
-        /// results.</param>
-        public TransactionListResult(IList<Transaction> value = default(IList<Transaction>), string nextLink = default(string))
-        {
-            Value = value;
-            NextLink = nextLink;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of reservation transactions.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<Transaction> Value { get; private set; }
-
-        /// <summary>
-        /// Gets the link (url) to the next page of results.
-        /// </summary>
-        [JsonProperty(PropertyName = "nextLink")]
-        public string NextLink { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequest.cs
deleted file mode 100644
index caee5a03f3323..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequest.cs
+++ /dev/null
@@ -1,66 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Request parameters to transfer billing subscription.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class TransferBillingSubscriptionRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the
-        /// TransferBillingSubscriptionRequest class.
-        /// </summary>
-        public TransferBillingSubscriptionRequest()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the
-        /// TransferBillingSubscriptionRequest class.
-        /// </summary>
-        /// <param name="destinationInvoiceSectionId">The destination invoice
-        /// section id.</param>
-        /// <param name="destinationBillingProfileId">The destination billing
-        /// profile id.</param>
-        public TransferBillingSubscriptionRequest(string destinationInvoiceSectionId = default(string), string destinationBillingProfileId = default(string))
-        {
-            DestinationInvoiceSectionId = destinationInvoiceSectionId;
-            DestinationBillingProfileId = destinationBillingProfileId;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the destination invoice section id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.destinationInvoiceSectionId")]
-        public string DestinationInvoiceSectionId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the destination billing profile id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.destinationBillingProfileId")]
-        public string DestinationBillingProfileId { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequestProperties.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequestProperties.cs
index c441d309ce65a..58ad2fc19b6b9 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequestProperties.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionRequestProperties.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.Azure.Management.Billing.Models
 {
+    using Microsoft.Rest;
     using Newtonsoft.Json;
     using System.Linq;
 
@@ -33,12 +34,9 @@ public TransferBillingSubscriptionRequestProperties()
         /// </summary>
         /// <param name="destinationInvoiceSectionId">The destination invoice
         /// section id.</param>
-        /// <param name="destinationBillingProfileId">The destination billing
-        /// profile id.</param>
-        public TransferBillingSubscriptionRequestProperties(string destinationInvoiceSectionId = default(string), string destinationBillingProfileId = default(string))
+        public TransferBillingSubscriptionRequestProperties(string destinationInvoiceSectionId)
         {
             DestinationInvoiceSectionId = destinationInvoiceSectionId;
-            DestinationBillingProfileId = destinationBillingProfileId;
             CustomInit();
         }
 
@@ -54,10 +52,17 @@ public TransferBillingSubscriptionRequestProperties()
         public string DestinationInvoiceSectionId { get; set; }
 
         /// <summary>
-        /// Gets or sets the destination billing profile id.
+        /// Validate the object.
         /// </summary>
-        [JsonProperty(PropertyName = "destinationBillingProfileId")]
-        public string DestinationBillingProfileId { get; set; }
-
+        /// <exception cref="ValidationException">
+        /// Thrown if validation fails
+        /// </exception>
+        public virtual void Validate()
+        {
+            if (DestinationInvoiceSectionId == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "DestinationInvoiceSectionId");
+            }
+        }
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionResult.cs
deleted file mode 100644
index fb1f3255f86fe..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferBillingSubscriptionResult.cs
+++ /dev/null
@@ -1,57 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Request parameters to transfer billing subscription.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class TransferBillingSubscriptionResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the TransferBillingSubscriptionResult
-        /// class.
-        /// </summary>
-        public TransferBillingSubscriptionResult()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TransferBillingSubscriptionResult
-        /// class.
-        /// </summary>
-        /// <param name="billingSubscriptionName">The destination billing
-        /// subscription id.</param>
-        public TransferBillingSubscriptionResult(string billingSubscriptionName = default(string))
-        {
-            BillingSubscriptionName = billingSubscriptionName;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the destination billing subscription id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.billingSubscriptionName")]
-        public string BillingSubscriptionName { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferDetails.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferDetails.cs
deleted file mode 100644
index 293d805691c8d..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferDetails.cs
+++ /dev/null
@@ -1,170 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Details of the transfer.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class TransferDetails
-    {
-        /// <summary>
-        /// Initializes a new instance of the TransferDetails class.
-        /// </summary>
-        public TransferDetails()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the TransferDetails class.
-        /// </summary>
-        /// <param name="creationTime">Transfer creation time.</param>
-        /// <param name="expirationTime">Transfer expiration time.</param>
-        /// <param name="invoiceSectionId">Target invoice section Id.</param>
-        /// <param name="billingAccountId">Target billing account Id.</param>
-        /// <param name="resellerId">Reseller Id for transfer.</param>
-        /// <param name="resellerName">Reseller name for transfer.</param>
-        /// <param name="initiatorCustomerType">Customer type of the
-        /// initiator.</param>
-        /// <param name="billingProfileId">Target billing profile Id.</param>
-        /// <param name="transferStatus">Overall transfer status. Possible
-        /// values include: 'Pending', 'InProgress', 'Completed',
-        /// 'CompletedWithErrors', 'Failed', 'Canceled', 'Declined'</param>
-        /// <param name="recipientEmailId">Email Id of recipient of
-        /// transfer.</param>
-        /// <param name="initiatorEmailId">Email Id of initiator of
-        /// transfer.</param>
-        /// <param name="canceledBy">Email Id who user canceled the
-        /// transfer.</param>
-        /// <param name="lastModifiedTime">Transfer last modification
-        /// time.</param>
-        /// <param name="detailedTransferStatus">Detailed transfer
-        /// status.</param>
-        public TransferDetails(System.DateTime? creationTime = default(System.DateTime?), System.DateTime? expirationTime = default(System.DateTime?), string invoiceSectionId = default(string), string billingAccountId = default(string), string resellerId = default(string), string resellerName = default(string), string initiatorCustomerType = default(string), string billingProfileId = default(string), string transferStatus = default(string), string recipientEmailId = default(string), string initiatorEmailId = default(string), string canceledBy = default(string), System.DateTime? lastModifiedTime = default(System.DateTime?), IList<DetailedTransferStatus> detailedTransferStatus = default(IList<DetailedTransferStatus>))
-        {
-            CreationTime = creationTime;
-            ExpirationTime = expirationTime;
-            InvoiceSectionId = invoiceSectionId;
-            BillingAccountId = billingAccountId;
-            ResellerId = resellerId;
-            ResellerName = resellerName;
-            InitiatorCustomerType = initiatorCustomerType;
-            BillingProfileId = billingProfileId;
-            TransferStatus = transferStatus;
-            RecipientEmailId = recipientEmailId;
-            InitiatorEmailId = initiatorEmailId;
-            CanceledBy = canceledBy;
-            LastModifiedTime = lastModifiedTime;
-            DetailedTransferStatus = detailedTransferStatus;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets transfer creation time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.creationTime")]
-        public System.DateTime? CreationTime { get; private set; }
-
-        /// <summary>
-        /// Gets transfer expiration time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.expirationTime")]
-        public System.DateTime? ExpirationTime { get; private set; }
-
-        /// <summary>
-        /// Gets target invoice section Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.invoiceSectionId")]
-        public string InvoiceSectionId { get; private set; }
-
-        /// <summary>
-        /// Gets target billing account Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.billingAccountId")]
-        public string BillingAccountId { get; private set; }
-
-        /// <summary>
-        /// Gets reseller Id for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.resellerId")]
-        public string ResellerId { get; private set; }
-
-        /// <summary>
-        /// Gets reseller name for transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.resellerName")]
-        public string ResellerName { get; private set; }
-
-        /// <summary>
-        /// Gets customer type of the initiator.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.initiatorCustomerType")]
-        public string InitiatorCustomerType { get; private set; }
-
-        /// <summary>
-        /// Gets target billing profile Id.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.billingProfileId")]
-        public string BillingProfileId { get; private set; }
-
-        /// <summary>
-        /// Gets overall transfer status. Possible values include: 'Pending',
-        /// 'InProgress', 'Completed', 'CompletedWithErrors', 'Failed',
-        /// 'Canceled', 'Declined'
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.transferStatus")]
-        public string TransferStatus { get; private set; }
-
-        /// <summary>
-        /// Gets email Id of recipient of transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.recipientEmailId")]
-        public string RecipientEmailId { get; private set; }
-
-        /// <summary>
-        /// Gets email Id of initiator of transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.initiatorEmailId")]
-        public string InitiatorEmailId { get; private set; }
-
-        /// <summary>
-        /// Gets email Id who user canceled the transfer.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.canceledBy")]
-        public string CanceledBy { get; private set; }
-
-        /// <summary>
-        /// Gets transfer last modification time.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.lastModifiedTime")]
-        public System.DateTime? LastModifiedTime { get; private set; }
-
-        /// <summary>
-        /// Gets detailed transfer status.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.detailedTransferStatus")]
-        public IList<DetailedTransferStatus> DetailedTransferStatus { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferProductRequestProperties.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferProductRequestProperties.cs
index 76f21e33a9eb6..f8ce7edb5219d 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferProductRequestProperties.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferProductRequestProperties.cs
@@ -33,12 +33,9 @@ public TransferProductRequestProperties()
         /// </summary>
         /// <param name="destinationInvoiceSectionId">The destination invoice
         /// section id.</param>
-        /// <param name="destinationBillingProfileId">The destination billing
-        /// profile id.</param>
-        public TransferProductRequestProperties(string destinationInvoiceSectionId = default(string), string destinationBillingProfileId = default(string))
+        public TransferProductRequestProperties(string destinationInvoiceSectionId = default(string))
         {
             DestinationInvoiceSectionId = destinationInvoiceSectionId;
-            DestinationBillingProfileId = destinationBillingProfileId;
             CustomInit();
         }
 
@@ -53,11 +50,5 @@ public TransferProductRequestProperties()
         [JsonProperty(PropertyName = "destinationInvoiceSectionId")]
         public string DestinationInvoiceSectionId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the destination billing profile id.
-        /// </summary>
-        [JsonProperty(PropertyName = "destinationBillingProfileId")]
-        public string DestinationBillingProfileId { get; set; }
-
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferStatus.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferStatus.cs
deleted file mode 100644
index 922c838a72440..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/TransferStatus.cs
+++ /dev/null
@@ -1,27 +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.Billing.Models
-{
-
-    /// <summary>
-    /// Defines values for TransferStatus.
-    /// </summary>
-    public static class TransferStatus
-    {
-        public const string Pending = "Pending";
-        public const string InProgress = "InProgress";
-        public const string Completed = "Completed";
-        public const string CompletedWithErrors = "CompletedWithErrors";
-        public const string Failed = "Failed";
-        public const string Canceled = "Canceled";
-        public const string Declined = "Declined";
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewOperation.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewOperation.cs
deleted file mode 100644
index d30e817542b05..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewOperation.cs
+++ /dev/null
@@ -1,54 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Summary of cancel product operation
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class UpdateAutoRenewOperation
-    {
-        /// <summary>
-        /// Initializes a new instance of the UpdateAutoRenewOperation class.
-        /// </summary>
-        public UpdateAutoRenewOperation()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the UpdateAutoRenewOperation class.
-        /// </summary>
-        /// <param name="endDate">The end date of this asset</param>
-        public UpdateAutoRenewOperation(System.DateTime? endDate = default(System.DateTime?))
-        {
-            EndDate = endDate;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets the end date of this asset
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.endDate")]
-        public System.DateTime? EndDate { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewRequest.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewRequest.cs
deleted file mode 100644
index 40e406b512007..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/UpdateAutoRenewRequest.cs
+++ /dev/null
@@ -1,53 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// Request parameters to update auto renew for support product.
-    /// </summary>
-    public partial class UpdateAutoRenewRequest
-    {
-        /// <summary>
-        /// Initializes a new instance of the UpdateAutoRenewRequest class.
-        /// </summary>
-        public UpdateAutoRenewRequest()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the UpdateAutoRenewRequest class.
-        /// </summary>
-        /// <param name="autoRenew">Request parameters to update auto renew
-        /// policy a product. Possible values include: 'true', 'false'</param>
-        public UpdateAutoRenewRequest(string autoRenew = default(string))
-        {
-            AutoRenew = autoRenew;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets or sets request parameters to update auto renew policy a
-        /// product. Possible values include: 'true', 'false'
-        /// </summary>
-        [JsonProperty(PropertyName = "autoRenew")]
-        public string AutoRenew { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateAddressResponse.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateAddressResponse.cs
index 076c6728e33de..f3ec2bbcb8462 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateAddressResponse.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateAddressResponse.cs
@@ -33,7 +33,7 @@ public ValidateAddressResponse()
         /// </summary>
         /// <param name="status">status of the address validation. Possible
         /// values include: 'Valid', 'Invalid'</param>
-        /// <param name="suggestedAddresses">list of suggested
+        /// <param name="suggestedAddresses">The list of suggested
         /// addresses.</param>
         /// <param name="validationMessage">Validation error message.</param>
         public ValidateAddressResponse(string status = default(string), IList<AddressDetails> suggestedAddresses = default(IList<AddressDetails>), string validationMessage = default(string))
@@ -57,7 +57,7 @@ public ValidateAddressResponse()
         public string Status { get; set; }
 
         /// <summary>
-        /// Gets or sets list of suggested addresses.
+        /// Gets or sets the list of suggested addresses.
         /// </summary>
         [JsonProperty(PropertyName = "suggestedAddresses")]
         public IList<AddressDetails> SuggestedAddresses { get; set; }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateProductTransferEligibilityResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateProductTransferEligibilityResult.cs
index 20546dd70c0fe..ff0c8119304e4 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateProductTransferEligibilityResult.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateProductTransferEligibilityResult.cs
@@ -31,12 +31,12 @@ public ValidateProductTransferEligibilityResult()
         /// Initializes a new instance of the
         /// ValidateProductTransferEligibilityResult class.
         /// </summary>
-        /// <param name="isTransferEligible">Specifies whether the transfer is
+        /// <param name="isMoveEligible">Specifies whether the transfer is
         /// eligible or not.</param>
         /// <param name="errorDetails">Validation error details.</param>
-        public ValidateProductTransferEligibilityResult(bool? isTransferEligible = default(bool?), ValidateProductTransferEligibilityError errorDetails = default(ValidateProductTransferEligibilityError))
+        public ValidateProductTransferEligibilityResult(bool? isMoveEligible = default(bool?), ValidateProductTransferEligibilityError errorDetails = default(ValidateProductTransferEligibilityError))
         {
-            IsTransferEligible = isTransferEligible;
+            IsMoveEligible = isMoveEligible;
             ErrorDetails = errorDetails;
             CustomInit();
         }
@@ -49,8 +49,8 @@ public ValidateProductTransferEligibilityResult()
         /// <summary>
         /// Gets specifies whether the transfer is eligible or not.
         /// </summary>
-        [JsonProperty(PropertyName = "isTransferEligible")]
-        public bool? IsTransferEligible { get; private set; }
+        [JsonProperty(PropertyName = "isMoveEligible")]
+        public bool? IsMoveEligible { get; private set; }
 
         /// <summary>
         /// Gets or sets validation error details.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateSubscriptionTransferEligibilityResult.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateSubscriptionTransferEligibilityResult.cs
index d467475793bac..e8fb98e410444 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateSubscriptionTransferEligibilityResult.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateSubscriptionTransferEligibilityResult.cs
@@ -31,12 +31,12 @@ public ValidateSubscriptionTransferEligibilityResult()
         /// Initializes a new instance of the
         /// ValidateSubscriptionTransferEligibilityResult class.
         /// </summary>
-        /// <param name="isTransferEligible">Specifies whether the transfer is
-        /// eligible or not.</param>
+        /// <param name="isMoveEligible">Specifies whether the subscription is
+        /// eligible to be transferred.</param>
         /// <param name="errorDetails">Validation error details.</param>
-        public ValidateSubscriptionTransferEligibilityResult(bool? isTransferEligible = default(bool?), ValidateSubscriptionTransferEligibilityError errorDetails = default(ValidateSubscriptionTransferEligibilityError))
+        public ValidateSubscriptionTransferEligibilityResult(bool? isMoveEligible = default(bool?), ValidateSubscriptionTransferEligibilityError errorDetails = default(ValidateSubscriptionTransferEligibilityError))
         {
-            IsTransferEligible = isTransferEligible;
+            IsMoveEligible = isMoveEligible;
             ErrorDetails = errorDetails;
             CustomInit();
         }
@@ -47,10 +47,11 @@ public ValidateSubscriptionTransferEligibilityResult()
         partial void CustomInit();
 
         /// <summary>
-        /// Gets specifies whether the transfer is eligible or not.
+        /// Gets specifies whether the subscription is eligible to be
+        /// transferred.
         /// </summary>
-        [JsonProperty(PropertyName = "isTransferEligible")]
-        public bool? IsTransferEligible { get; private set; }
+        [JsonProperty(PropertyName = "isMoveEligible")]
+        public bool? IsMoveEligible { get; private set; }
 
         /// <summary>
         /// Gets or sets validation error details.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferListResponse.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferListResponse.cs
deleted file mode 100644
index 3315764c903f1..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferListResponse.cs
+++ /dev/null
@@ -1,56 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Result of transfer validation.
-    /// </summary>
-    public partial class ValidateTransferListResponse
-    {
-        /// <summary>
-        /// Initializes a new instance of the ValidateTransferListResponse
-        /// class.
-        /// </summary>
-        public ValidateTransferListResponse()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ValidateTransferListResponse
-        /// class.
-        /// </summary>
-        /// <param name="value">The list of transfer validation
-        /// results.</param>
-        public ValidateTransferListResponse(IList<ValidateTransferResponse> value = default(IList<ValidateTransferResponse>))
-        {
-            Value = value;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the list of transfer validation results.
-        /// </summary>
-        [JsonProperty(PropertyName = "value")]
-        public IList<ValidateTransferResponse> Value { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferResponse.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferResponse.cs
deleted file mode 100644
index e5ff705c05b19..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidateTransferResponse.cs
+++ /dev/null
@@ -1,73 +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.Billing.Models
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Serialization;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-
-    /// <summary>
-    /// Transfer validation response.
-    /// </summary>
-    [Rest.Serialization.JsonTransformation]
-    public partial class ValidateTransferResponse
-    {
-        /// <summary>
-        /// Initializes a new instance of the ValidateTransferResponse class.
-        /// </summary>
-        public ValidateTransferResponse()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ValidateTransferResponse class.
-        /// </summary>
-        /// <param name="status">The status of validation</param>
-        /// <param name="productId">The product id for which this result
-        /// applies.</param>
-        /// <param name="results">Array of validation results.</param>
-        public ValidateTransferResponse(string status = default(string), string productId = default(string), IList<ValidationResultProperties> results = default(IList<ValidationResultProperties>))
-        {
-            Status = status;
-            ProductId = productId;
-            Results = results;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets the status of validation
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.status")]
-        public string Status { get; private set; }
-
-        /// <summary>
-        /// Gets the product id for which this result applies.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.productId")]
-        public string ProductId { get; private set; }
-
-        /// <summary>
-        /// Gets or sets array of validation results.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.results")]
-        public IList<ValidationResultProperties> Results { get; set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidationResultProperties.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidationResultProperties.cs
deleted file mode 100644
index 5f59a5f39c399..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Models/ValidationResultProperties.cs
+++ /dev/null
@@ -1,67 +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.Billing.Models
-{
-    using Newtonsoft.Json;
-    using System.Linq;
-
-    /// <summary>
-    /// The properties of the validation result.
-    /// </summary>
-    public partial class ValidationResultProperties
-    {
-        /// <summary>
-        /// Initializes a new instance of the ValidationResultProperties class.
-        /// </summary>
-        public ValidationResultProperties()
-        {
-            CustomInit();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the ValidationResultProperties class.
-        /// </summary>
-        /// <param name="level">Result Level.</param>
-        /// <param name="code">Result Code.</param>
-        /// <param name="message">The validation message.</param>
-        public ValidationResultProperties(string level = default(string), string code = default(string), string message = default(string))
-        {
-            Level = level;
-            Code = code;
-            Message = message;
-            CustomInit();
-        }
-
-        /// <summary>
-        /// An initialization method that performs custom operations like setting defaults
-        /// </summary>
-        partial void CustomInit();
-
-        /// <summary>
-        /// Gets result Level.
-        /// </summary>
-        [JsonProperty(PropertyName = "level")]
-        public string Level { get; private set; }
-
-        /// <summary>
-        /// Gets result Code.
-        /// </summary>
-        [JsonProperty(PropertyName = "code")]
-        public string Code { get; private set; }
-
-        /// <summary>
-        /// Gets the validation message.
-        /// </summary>
-        [JsonProperty(PropertyName = "message")]
-        public string Message { get; private set; }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Operations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Operations.cs
index 45722dc878eb1..7507aedc34766 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Operations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/Operations.cs
@@ -51,7 +51,8 @@ internal Operations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists all of the available billing REST API operations.
+        /// Lists the available billing REST API operations.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -219,7 +220,8 @@ internal Operations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists all of the available billing REST API operations.
+        /// Lists the available billing REST API operations.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
         /// The NextLink from the previous successful call to List operation.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/OperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/OperationsExtensions.cs
index b9095e5290b64..e34702e764991 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/OperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/OperationsExtensions.cs
@@ -22,7 +22,8 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class OperationsExtensions
     {
             /// <summary>
-            /// Lists all of the available billing REST API operations.
+            /// Lists the available billing REST API operations.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -33,7 +34,8 @@ public static IPage<Operation> List(this IOperations operations)
             }
 
             /// <summary>
-            /// Lists all of the available billing REST API operations.
+            /// Lists the available billing REST API operations.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -50,7 +52,8 @@ public static IPage<Operation> List(this IOperations operations)
             }
 
             /// <summary>
-            /// Lists all of the available billing REST API operations.
+            /// Lists the available billing REST API operations.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
@@ -64,7 +67,8 @@ public static IPage<Operation> ListNext(this IOperations operations, string next
             }
 
             /// <summary>
-            /// Lists all of the available billing REST API operations.
+            /// Lists the available billing REST API operations.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperationsExtensions.cs
deleted file mode 100644
index 8f13960e5ac32..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PaymentMethodsOperationsExtensions.cs
+++ /dev/null
@@ -1,175 +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.Billing
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Extension methods for PaymentMethodsOperations.
-    /// </summary>
-    public static partial class PaymentMethodsOperationsExtensions
-    {
-            /// <summary>
-            /// Lists the Payment Methods by billing account Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            public static IPage<PaymentMethod> ListByBillingAccount(this IPaymentMethodsOperations operations, string billingAccountName)
-            {
-                return operations.ListByBillingAccountAsync(billingAccountName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing account Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<PaymentMethod>> ListByBillingAccountAsync(this IPaymentMethodsOperations operations, string billingAccountName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing profile Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            public static IPage<PaymentMethod> ListByBillingProfile(this IPaymentMethodsOperations operations, string billingAccountName, string billingProfileName)
-            {
-                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing profile Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<PaymentMethod>> ListByBillingProfileAsync(this IPaymentMethodsOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing account Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
-            /// </summary>
-            /// <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<PaymentMethod> ListByBillingAccountNext(this IPaymentMethodsOperations operations, string nextPageLink)
-            {
-                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing account Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/2019-10-01-preview/paymentmethods" />
-            /// </summary>
-            /// <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<PaymentMethod>> ListByBillingAccountNextAsync(this IPaymentMethodsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing profile Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <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<PaymentMethod> ListByBillingProfileNext(this IPaymentMethodsOperations operations, string nextPageLink)
-            {
-                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the Payment Methods by billing profile Id.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <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<PaymentMethod>> ListByBillingProfileNextAsync(this IPaymentMethodsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperations.cs
index be77473861973..c4a27e1102a32 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperations.cs
@@ -51,14 +51,15 @@ internal PoliciesOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// The policy for a given billing account name and billing profile name.
+        /// Lists the policies for a billing profile. This operation is supported only
+        /// for billing accounts with agreement type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -238,16 +239,17 @@ internal PoliciesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to update a policy.
+        /// Updates the policies for a billing profile. This operation is supported
+        /// only for billing accounts with agreement type Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the update policy operation.
+        /// Request parameters that are provided to the update policies operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -438,14 +440,15 @@ internal PoliciesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The policy for a given billing account name and customer name.
+        /// Lists the policies for a customer. This operation is supported only for
+        /// billing accounts with agreement type Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -625,16 +628,17 @@ internal PoliciesOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to update a Customer policy.
+        /// Updates the policies for a customer. This operation is supported only for
+        /// billing accounts with agreement type Microsoft Partner Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the update customer policy operation.
+        /// Request parameters that are provided to the update policies operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperationsExtensions.cs
index 05364c6b933fd..bad12c0bcf9a0 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PoliciesOperationsExtensions.cs
@@ -22,17 +22,18 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class PoliciesOperationsExtensions
     {
             /// <summary>
-            /// The policy for a given billing account name and billing profile name.
+            /// Lists the policies for a billing profile. This operation is supported only
+            /// for billing accounts with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             public static Policy GetByBillingProfile(this IPoliciesOperations operations, string billingAccountName, string billingProfileName)
             {
@@ -40,17 +41,18 @@ public static Policy GetByBillingProfile(this IPoliciesOperations operations, st
             }
 
             /// <summary>
-            /// The policy for a given billing account name and billing profile name.
+            /// Lists the policies for a billing profile. This operation is supported only
+            /// for billing accounts with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -64,19 +66,20 @@ public static Policy GetByBillingProfile(this IPoliciesOperations operations, st
             }
 
             /// <summary>
-            /// The operation to update a policy.
+            /// Updates the policies for a billing profile. This operation is supported
+            /// only for billing accounts with agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the update policy operation.
+            /// Request parameters that are provided to the update policies operation.
             /// </param>
             public static Policy Update(this IPoliciesOperations operations, string billingAccountName, string billingProfileName, Policy parameters)
             {
@@ -84,19 +87,20 @@ public static Policy Update(this IPoliciesOperations operations, string billingA
             }
 
             /// <summary>
-            /// The operation to update a policy.
+            /// Updates the policies for a billing profile. This operation is supported
+            /// only for billing accounts with agreement type Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the update policy operation.
+            /// Request parameters that are provided to the update policies operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -110,17 +114,18 @@ public static Policy Update(this IPoliciesOperations operations, string billingA
             }
 
             /// <summary>
-            /// The policy for a given billing account name and customer name.
+            /// Lists the policies for a customer. This operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             public static CustomerPolicy GetByCustomer(this IPoliciesOperations operations, string billingAccountName, string customerName)
             {
@@ -128,17 +133,18 @@ public static CustomerPolicy GetByCustomer(this IPoliciesOperations operations,
             }
 
             /// <summary>
-            /// The policy for a given billing account name and customer name.
+            /// Lists the policies for a customer. This operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -152,19 +158,20 @@ public static CustomerPolicy GetByCustomer(this IPoliciesOperations operations,
             }
 
             /// <summary>
-            /// The operation to update a Customer policy.
+            /// Updates the policies for a customer. This operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the update customer policy operation.
+            /// Request parameters that are provided to the update policies operation.
             /// </param>
             public static CustomerPolicy UpdateCustomer(this IPoliciesOperations operations, string billingAccountName, string customerName, CustomerPolicy parameters)
             {
@@ -172,19 +179,20 @@ public static CustomerPolicy UpdateCustomer(this IPoliciesOperations operations,
             }
 
             /// <summary>
-            /// The operation to update a Customer policy.
+            /// Updates the policies for a customer. This operation is supported only for
+            /// billing accounts with agreement type Microsoft Partner Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the update customer policy operation.
+            /// Request parameters that are provided to the update policies operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperations.cs
deleted file mode 100644
index 73c97053b8c61..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperations.cs
+++ /dev/null
@@ -1,508 +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.Billing
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using Newtonsoft.Json;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// PriceSheetOperations operations.
-    /// </summary>
-    internal partial class PriceSheetOperations : IServiceOperations<BillingManagementClient>, IPriceSheetOperations
-    {
-        /// <summary>
-        /// Initializes a new instance of the PriceSheetOperations class.
-        /// </summary>
-        /// <param name='client'>
-        /// Reference to the service client.
-        /// </param>
-        /// <exception cref="System.ArgumentNullException">
-        /// Thrown when a required parameter is null
-        /// </exception>
-        internal PriceSheetOperations(BillingManagementClient client)
-        {
-            if (client == null)
-            {
-                throw new System.ArgumentNullException("client");
-            }
-            Client = client;
-        }
-
-        /// <summary>
-        /// Gets a reference to the BillingManagementClient
-        /// </summary>
-        public BillingManagementClient Client { get; private set; }
-
-        /// <summary>
-        /// Download price sheet for an invoice.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceName'>
-        /// Invoice Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<DownloadUrl,PriceSheetDownloadHeaders>> DownloadWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<DownloadUrl,PriceSheetDownloadHeaders> _response = await BeginDownloadWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Download price sheet for a billing profile.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// The headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        public async Task<AzureOperationResponse<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders>> DownloadByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            // Send request
-            AzureOperationResponse<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders> _response = await BeginDownloadByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, customHeaders, cancellationToken).ConfigureAwait(false);
-            return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Download price sheet for an invoice.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceName'>
-        /// Invoice Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadHeaders>> BeginDownloadWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceName", invoiceName);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginDownload", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoices/{invoiceName}/pricesheet/default/download").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
-            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;
-            // 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<DownloadUrl,PriceSheetDownloadHeaders>();
-            _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<DownloadUrl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            try
-            {
-                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<PriceSheetDownloadHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
-            }
-            catch (JsonException ex)
-            {
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-        /// <summary>
-        /// Download price sheet for a billing profile.
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders>> BeginDownloadByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "BeginDownloadByBillingProfile", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/pricesheet/default/download").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            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;
-            // 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<DownloadUrl,PriceSheetDownloadByBillingProfileHeaders>();
-            _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<DownloadUrl>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
-            try
-            {
-                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<PriceSheetDownloadByBillingProfileHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
-            }
-            catch (JsonException ex)
-            {
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
-            }
-            if (_shouldTrace)
-            {
-                ServiceClientTracing.Exit(_invocationId, _result);
-            }
-            return _result;
-        }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperationsExtensions.cs
deleted file mode 100644
index a1be5f407ad0e..0000000000000
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/PriceSheetOperationsExtensions.cs
+++ /dev/null
@@ -1,197 +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.Billing
-{
-    using Microsoft.Rest;
-    using Microsoft.Rest.Azure;
-    using Models;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Extension methods for PriceSheetOperations.
-    /// </summary>
-    public static partial class PriceSheetOperationsExtensions
-    {
-            /// <summary>
-            /// Download price sheet for an invoice.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceName'>
-            /// Invoice Id.
-            /// </param>
-            public static DownloadUrl Download(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, string invoiceName)
-            {
-                return operations.DownloadAsync(billingAccountName, billingProfileName, invoiceName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Download price sheet for an invoice.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceName'>
-            /// Invoice Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<DownloadUrl> DownloadAsync(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.DownloadWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Download price sheet for a billing profile.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            public static DownloadUrl DownloadByBillingProfile(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName)
-            {
-                return operations.DownloadByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Download price sheet for a billing profile.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<DownloadUrl> DownloadByBillingProfileAsync(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.DownloadByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Download price sheet for an invoice.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceName'>
-            /// Invoice Id.
-            /// </param>
-            public static DownloadUrl BeginDownload(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, string invoiceName)
-            {
-                return operations.BeginDownloadAsync(billingAccountName, billingProfileName, invoiceName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Download price sheet for an invoice.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceName'>
-            /// Invoice Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<DownloadUrl> BeginDownloadAsync(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginDownloadWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Download price sheet for a billing profile.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            public static DownloadUrl BeginDownloadByBillingProfile(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName)
-            {
-                return operations.BeginDownloadByBillingProfileAsync(billingAccountName, billingProfileName).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Download price sheet for a billing profile.
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<DownloadUrl> BeginDownloadByBillingProfileAsync(this IPriceSheetOperations operations, string billingAccountName, string billingProfileName, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.BeginDownloadByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-    }
-}
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperations.cs
index 7ad32db0d2a88..f172b07bacbaa 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperations.cs
@@ -51,20 +51,16 @@ internal ProductsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists products by customer id.
+        /// Lists the products for a customer. These don't include products billed
+        /// based on usage.The operation is supported only for billing accounts with
+        /// agreement type Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by product type. The filter supports 'eq', 'lt',
-        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
-        /// separated by a colon (:).
+        /// The ID that uniquely identifies a customer.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -87,7 +83,7 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProductsListResult>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Product>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
@@ -110,7 +106,6 @@ internal ProductsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
                 tracingParameters.Add("customerName", customerName);
-                tracingParameters.Add("filter", filter);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "ListByCustomer", tracingParameters);
             }
@@ -124,10 +119,6 @@ internal ProductsOperations(BillingManagementClient client)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
-            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -216,7 +207,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProductsListResult>();
+            var _result = new AzureOperationResponse<IPage<Product>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -229,7 +220,7 @@ internal ProductsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProductsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Product>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -249,17 +240,19 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get a customer's product by name.
+        /// Lists the products for a billing account. These don't include products
+        /// billed based on usage. The operation is supported for billing accounts with
+        /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='productName'>
-        /// Invoice Id.
+        /// <param name='filter'>
+        /// May be used to filter by product type. The filter supports 'eq', 'lt',
+        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
+        /// 'not'. Tag filter is a key value pair string where key and value are
+        /// separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -282,20 +275,12 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Product>> GetByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (customerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "customerName");
-            }
-            if (productName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "productName");
-            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -308,22 +293,23 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("customerName", customerName);
-                tracingParameters.Add("productName", productName);
+                tracingParameters.Add("filter", filter);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "GetByCustomer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/products/{productName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{customerName}", System.Uri.EscapeDataString(customerName));
-            _url = _url.Replace("{productName}", System.Uri.EscapeDataString(productName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
             }
+            if (filter != null)
+            {
+                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
+            }
             if (_queryParameters.Count > 0)
             {
                 _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
@@ -412,7 +398,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Product>();
+            var _result = new AzureOperationResponse<IPage<Product>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -425,7 +411,7 @@ internal ProductsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Product>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Product>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -445,16 +431,21 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists products by billing account name.
+        /// Lists the products for a billing profile. These don't include products
+        /// billed based on usage. The operation is supported for billing accounts with
+        /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
+        /// </param>
+        /// <param name='billingProfileName'>
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='filter'>
         /// May be used to filter by product type. The filter supports 'eq', 'lt',
         /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
+        /// 'not'. Tag filter is a key value pair string where key and value are
         /// separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
@@ -478,12 +469,16 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Product>>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
+            if (billingProfileName == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
+            }
             if (Client.ApiVersion == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
@@ -496,14 +491,16 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
+                tracingParameters.Add("billingProfileName", billingProfileName);
                 tracingParameters.Add("filter", filter);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/products").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
+            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
             {
@@ -634,22 +631,24 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists products by invoice section name.
+        /// Lists the products for an invoice section. These don't include products
+        /// billed based on usage. The operation is supported only for billing accounts
+        /// with agreement type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='billingProfileName'>
-        /// Billing Profile Id.
+        /// The ID that uniquely identifies a billing profile.
         /// </param>
         /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies an invoice section.
         /// </param>
         /// <param name='filter'>
         /// May be used to filter by product type. The filter supports 'eq', 'lt',
         /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
+        /// 'not'. Tag filter is a key value pair string where key and value are
         /// separated by a colon (:).
         /// </param>
         /// <param name='customHeaders'>
@@ -673,7 +672,7 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ProductsListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Product>>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
@@ -808,7 +807,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ProductsListResult>();
+            var _result = new AzureOperationResponse<IPage<Product>>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -821,7 +820,7 @@ internal ProductsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ProductsListResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Page<Product>>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -841,20 +840,15 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Get a single product by name.
+        /// Gets a product by ID. The operation is supported only for billing accounts
+        /// with agreement type Microsoft Customer Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -877,20 +871,12 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Product>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Product>> GetWithHttpMessagesAsync(string billingAccountName, string productName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
             if (productName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "productName");
@@ -907,18 +893,14 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("productName", productName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
                 ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products/{productName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             _url = _url.Replace("{productName}", System.Uri.EscapeDataString(productName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -1046,22 +1028,18 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// The operation to transfer a Product to another invoice section.
+        /// Updates the properties of a Product. Currently, auto renew can be updated.
+        /// The operation is supported only for billing accounts with agreement type
+        /// Microsoft Customer Agreement.
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Product operation.
+        /// Request parameters that are provided to the update product operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1084,20 +1062,12 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Product,ProductsTransferHeaders>> TransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Product>> UpdateWithHttpMessagesAsync(string billingAccountName, string productName, Product parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
             if (productName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "productName");
@@ -1118,19 +1088,15 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("productName", productName);
                 tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Transfer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Update", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products/{productName}/transfer").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             _url = _url.Replace("{productName}", System.Uri.EscapeDataString(productName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -1144,7 +1110,7 @@ internal ProductsOperations(BillingManagementClient 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)
@@ -1201,7 +1167,7 @@ internal ProductsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200 && (int)_statusCode != 202)
+            if ((int)_statusCode != 200)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1231,7 +1197,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<Product,ProductsTransferHeaders>();
+            var _result = new AzureOperationResponse<Product>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1256,19 +1222,6 @@ internal ProductsOperations(BillingManagementClient client)
                     throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
             }
-            try
-            {
-                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<ProductsTransferHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
-            }
-            catch (JsonException ex)
-            {
-                _httpRequest.Dispose();
-                if (_httpResponse != null)
-                {
-                    _httpResponse.Dispose();
-                }
-                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -1277,22 +1230,21 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Validates the transfer of products across invoice sections.
+        /// Moves a product's charges to a new invoice section. The new invoice section
+        /// must belong to the same billing profile as the existing invoice section.
+        /// This operation is supported only for products that are purchased with a
+        /// recurring charge and for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
         /// <param name='parameters'>
-        /// Parameters supplied to the Transfer Products operation.
+        /// Request parameters that are provided to the move product operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1315,24 +1267,20 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<ValidateProductTransferEligibilityResult>> ValidateTransferWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<Product,ProductsMoveHeaders>> MoveWithHttpMessagesAsync(string billingAccountName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
             if (productName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "productName");
             }
+            if (Client.ApiVersion == null)
+            {
+                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+            }
             if (parameters == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
@@ -1345,21 +1293,21 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("productName", productName);
                 tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ValidateTransfer", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "Move", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products/{productName}/validateTransferEligibility").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/move").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             _url = _url.Replace("{productName}", System.Uri.EscapeDataString(productName));
             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);
@@ -1424,7 +1372,7 @@ internal ProductsOperations(BillingManagementClient client)
             HttpStatusCode _statusCode = _httpResponse.StatusCode;
             cancellationToken.ThrowIfCancellationRequested();
             string _responseContent = null;
-            if ((int)_statusCode != 200)
+            if ((int)_statusCode != 200 && (int)_statusCode != 202)
             {
                 var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
                 try
@@ -1454,7 +1402,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<ValidateProductTransferEligibilityResult>();
+            var _result = new AzureOperationResponse<Product,ProductsMoveHeaders>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1467,7 +1415,7 @@ internal ProductsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ValidateProductTransferEligibilityResult>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<Product>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1479,6 +1427,19 @@ internal ProductsOperations(BillingManagementClient client)
                     throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
             }
+            try
+            {
+                _result.Headers = _httpResponse.GetHeadersAsJson().ToObject<ProductsMoveHeaders>(JsonSerializer.Create(Client.DeserializationSettings));
+            }
+            catch (JsonException ex)
+            {
+                _httpRequest.Dispose();
+                if (_httpResponse != null)
+                {
+                    _httpResponse.Dispose();
+                }
+                throw new SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
@@ -1487,22 +1448,21 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Cancel auto renew for product by product id and invoice section name
+        /// Validates if a product's charges can be moved to a new invoice section.
+        /// This operation is supported only for products that are purchased with a
+        /// recurring charge and for billing accounts with agreement type Microsoft
+        /// Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
         /// <param name='productName'>
-        /// Invoice Id.
+        /// The ID that uniquely identifies a product.
         /// </param>
-        /// <param name='body'>
-        /// Update auto renew request parameters.
+        /// <param name='parameters'>
+        /// Request parameters that are provided to the validate move eligibility
+        /// operation.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -1525,20 +1485,12 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<UpdateAutoRenewOperation>> UpdateAutoRenewByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, UpdateAutoRenewRequest body, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<ValidateProductTransferEligibilityResult>> ValidateMoveWithHttpMessagesAsync(string billingAccountName, string productName, TransferProductRequestProperties parameters, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
             if (productName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "productName");
@@ -1547,9 +1499,9 @@ internal ProductsOperations(BillingManagementClient client)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
             }
-            if (body == null)
+            if (parameters == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "body");
+                throw new ValidationException(ValidationRules.CannotBeNull, "parameters");
             }
             // Tracing
             bool _shouldTrace = ServiceClientTracing.IsEnabled;
@@ -1559,19 +1511,15 @@ internal ProductsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
                 tracingParameters.Add("productName", productName);
-                tracingParameters.Add("body", body);
+                tracingParameters.Add("parameters", parameters);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "UpdateAutoRenewByInvoiceSection", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ValidateMove", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products/{productName}/updateAutoRenew").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/validateMoveEligibility").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
             _url = _url.Replace("{productName}", System.Uri.EscapeDataString(productName));
             List<string> _queryParameters = new List<string>();
             if (Client.ApiVersion != null)
@@ -1616,9 +1564,9 @@ internal ProductsOperations(BillingManagementClient client)
 
             // Serialize Request
             string _requestContent = null;
-            if(body != null)
+            if(parameters != null)
             {
-                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(body, Client.SerializationSettings);
+                _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(parameters, 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");
             }
@@ -1672,7 +1620,7 @@ internal ProductsOperations(BillingManagementClient client)
                 throw ex;
             }
             // Create Result
-            var _result = new AzureOperationResponse<UpdateAutoRenewOperation>();
+            var _result = new AzureOperationResponse<ValidateProductTransferEligibilityResult>();
             _result.Request = _httpRequest;
             _result.Response = _httpResponse;
             if (_httpResponse.Headers.Contains("x-ms-request-id"))
@@ -1685,7 +1633,7 @@ internal ProductsOperations(BillingManagementClient client)
                 _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
                 try
                 {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<UpdateAutoRenewOperation>(_responseContent, Client.DeserializationSettings);
+                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<ValidateProductTransferEligibilityResult>(_responseContent, Client.DeserializationSettings);
                 }
                 catch (JsonException ex)
                 {
@@ -1705,7 +1653,9 @@ internal ProductsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists products by billing account name.
+        /// Lists the products for a customer. These don't include products billed
+        /// based on usage.The operation is supported only for billing accounts with
+        /// agreement type Microsoft Partner Agreement.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -1732,7 +1682,7 @@ internal ProductsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Product>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Product>>> ListByCustomerNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -1747,7 +1697,520 @@ internal ProductsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccountNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByCustomerNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Product>>();
+            _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<Product>>(_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>
+        /// Lists the products for a billing account. These don't include products
+        /// billed based on usage. The operation is supported for billing accounts with
+        /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Product>>> ListByBillingAccountNextWithHttpMessagesAsync(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, "ListByBillingAccountNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Product>>();
+            _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<Product>>(_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>
+        /// Lists the products for a billing profile. These don't include products
+        /// billed based on usage. The operation is supported for billing accounts with
+        /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Product>>> ListByBillingProfileNextWithHttpMessagesAsync(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, "ListByBillingProfileNext", 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+                try
+                {
+                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Product>>();
+            _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<Product>>(_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>
+        /// Lists the products for an invoice section. These don't include products
+        /// billed based on usage. The operation is supported only for billing accounts
+        /// with agreement type Microsoft Customer Agreement.
+        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+        /// </summary>
+        /// <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="ErrorResponseException">
+        /// 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<Product>>> ListByInvoiceSectionNextWithHttpMessagesAsync(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, "ListByInvoiceSectionNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperationsExtensions.cs
index d01234b0c380f..e6e85e29175ed 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/ProductsOperationsExtensions.cs
@@ -22,208 +22,218 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class ProductsOperationsExtensions
     {
             /// <summary>
-            /// Lists products by customer id.
+            /// Lists the products for a customer. These don't include products billed
+            /// based on usage.The operation is supported only for billing accounts with
+            /// agreement type Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a customer.
             /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by product type. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            public static ProductsListResult ListByCustomer(this IProductsOperations operations, string billingAccountName, string customerName, string filter = default(string))
+            public static IPage<Product> ListByCustomer(this IProductsOperations operations, string billingAccountName, string customerName)
             {
-                return operations.ListByCustomerAsync(billingAccountName, customerName, filter).GetAwaiter().GetResult();
+                return operations.ListByCustomerAsync(billingAccountName, customerName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists products by customer id.
+            /// Lists the products for a customer. These don't include products billed
+            /// based on usage.The operation is supported only for billing accounts with
+            /// agreement type Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='customerName'>
-            /// Customer name.
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by product type. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
+            /// The ID that uniquely identifies a customer.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProductsListResult> ListByCustomerAsync(this IProductsOperations operations, string billingAccountName, string customerName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Product>> ListByCustomerAsync(this IProductsOperations operations, string billingAccountName, string customerName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByCustomerWithHttpMessagesAsync(billingAccountName, customerName, filter, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByCustomerWithHttpMessagesAsync(billingAccountName, customerName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Get a customer's product by name.
+            /// Lists the products for a billing account. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
-            /// </param>
-            /// <param name='productName'>
-            /// Invoice Id.
+            /// <param name='filter'>
+            /// May be used to filter by product type. The filter supports 'eq', 'lt',
+            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
+            /// 'not'. Tag filter is a key value pair string where key and value are
+            /// separated by a colon (:).
             /// </param>
-            public static Product GetByCustomer(this IProductsOperations operations, string billingAccountName, string customerName, string productName)
+            public static IPage<Product> ListByBillingAccount(this IProductsOperations operations, string billingAccountName, string filter = default(string))
             {
-                return operations.GetByCustomerAsync(billingAccountName, customerName, productName).GetAwaiter().GetResult();
+                return operations.ListByBillingAccountAsync(billingAccountName, filter).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get a customer's product by name.
+            /// Lists the products for a billing account. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='productName'>
-            /// Invoice Id.
+            /// <param name='filter'>
+            /// May be used to filter by product type. The filter supports 'eq', 'lt',
+            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
+            /// 'not'. Tag filter is a key value pair string where key and value are
+            /// separated by a colon (:).
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Product> GetByCustomerAsync(this IProductsOperations operations, string billingAccountName, string customerName, string productName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Product>> ListByBillingAccountAsync(this IProductsOperations operations, string billingAccountName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetByCustomerWithHttpMessagesAsync(billingAccountName, customerName, productName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, filter, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists products by billing account name.
+            /// Lists the products for a billing profile. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='filter'>
             /// May be used to filter by product type. The filter supports 'eq', 'lt',
             /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
+            /// 'not'. Tag filter is a key value pair string where key and value are
             /// separated by a colon (:).
             /// </param>
-            public static IPage<Product> ListByBillingAccount(this IProductsOperations operations, string billingAccountName, string filter = default(string))
+            public static IPage<Product> ListByBillingProfile(this IProductsOperations operations, string billingAccountName, string billingProfileName, string filter = default(string))
             {
-                return operations.ListByBillingAccountAsync(billingAccountName, filter).GetAwaiter().GetResult();
+                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName, filter).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists products by billing account name.
+            /// Lists the products for a billing profile. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
+            /// </param>
+            /// <param name='billingProfileName'>
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='filter'>
             /// May be used to filter by product type. The filter supports 'eq', 'lt',
             /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
+            /// 'not'. Tag filter is a key value pair string where key and value are
             /// separated by a colon (:).
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Product>> ListByBillingAccountAsync(this IProductsOperations operations, string billingAccountName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Product>> ListByBillingProfileAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, filter, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, filter, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists products by invoice section name.
+            /// Lists the products for an invoice section. These don't include products
+            /// billed based on usage. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='filter'>
             /// May be used to filter by product type. The filter supports 'eq', 'lt',
             /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
+            /// 'not'. Tag filter is a key value pair string where key and value are
             /// separated by a colon (:).
             /// </param>
-            public static ProductsListResult ListByInvoiceSection(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string))
+            public static IPage<Product> ListByInvoiceSection(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string))
             {
                 return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName, filter).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists products by invoice section name.
+            /// Lists the products for an invoice section. These don't include products
+            /// billed based on usage. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing profile.
             /// </param>
             /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies an invoice section.
             /// </param>
             /// <param name='filter'>
             /// May be used to filter by product type. The filter supports 'eq', 'lt',
             /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
+            /// 'not'. Tag filter is a key value pair string where key and value are
             /// separated by a colon (:).
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ProductsListResult> ListByInvoiceSectionAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Product>> ListByInvoiceSectionAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
             {
                 using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, filter, null, cancellationToken).ConfigureAwait(false))
                 {
@@ -232,235 +242,255 @@ public static Product GetByCustomer(this IProductsOperations operations, string
             }
 
             /// <summary>
-            /// Get a single product by name.
+            /// Gets a product by ID. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
-            public static Product Get(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName)
+            public static Product Get(this IProductsOperations operations, string billingAccountName, string productName)
             {
-                return operations.GetAsync(billingAccountName, billingProfileName, invoiceSectionName, productName).GetAwaiter().GetResult();
+                return operations.GetAsync(billingAccountName, productName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get a single product by name.
+            /// Gets a product by ID. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Product> GetAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Product> GetAsync(this IProductsOperations operations, string billingAccountName, string productName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, productName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// The operation to transfer a Product to another invoice section.
+            /// Updates the properties of a Product. Currently, auto renew can be updated.
+            /// The operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Product operation.
+            /// Request parameters that are provided to the update product operation.
             /// </param>
-            public static Product Transfer(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters)
+            public static Product Update(this IProductsOperations operations, string billingAccountName, string productName, Product parameters)
             {
-                return operations.TransferAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, parameters).GetAwaiter().GetResult();
+                return operations.UpdateAsync(billingAccountName, productName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// The operation to transfer a Product to another invoice section.
+            /// Updates the properties of a Product. Currently, auto renew can be updated.
+            /// The operation is supported only for billing accounts with agreement type
+            /// Microsoft Customer Agreement.
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Product operation.
+            /// Request parameters that are provided to the update product operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<Product> TransferAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Product> UpdateAsync(this IProductsOperations operations, string billingAccountName, string productName, Product parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.TransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.UpdateWithHttpMessagesAsync(billingAccountName, productName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Validates the transfer of products across invoice sections.
+            /// Moves a product's charges to a new invoice section. The new invoice section
+            /// must belong to the same billing profile as the existing invoice section.
+            /// This operation is supported only for products that are purchased with a
+            /// recurring charge and for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Products operation.
+            /// Request parameters that are provided to the move product operation.
             /// </param>
-            public static ValidateProductTransferEligibilityResult ValidateTransfer(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters)
+            public static Product Move(this IProductsOperations operations, string billingAccountName, string productName, TransferProductRequestProperties parameters)
             {
-                return operations.ValidateTransferAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, parameters).GetAwaiter().GetResult();
+                return operations.MoveAsync(billingAccountName, productName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Validates the transfer of products across invoice sections.
+            /// Moves a product's charges to a new invoice section. The new invoice section
+            /// must belong to the same billing profile as the existing invoice section.
+            /// This operation is supported only for products that are purchased with a
+            /// recurring charge and for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
             /// <param name='parameters'>
-            /// Parameters supplied to the Transfer Products operation.
+            /// Request parameters that are provided to the move product operation.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<ValidateProductTransferEligibilityResult> ValidateTransferAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, TransferProductRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<Product> MoveAsync(this IProductsOperations operations, string billingAccountName, string productName, TransferProductRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ValidateTransferWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, parameters, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.MoveWithHttpMessagesAsync(billingAccountName, productName, parameters, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Cancel auto renew for product by product id and invoice section name
+            /// Validates if a product's charges can be moved to a new invoice section.
+            /// This operation is supported only for products that are purchased with a
+            /// recurring charge and for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
             /// <param name='productName'>
-            /// Invoice Id.
+            /// The ID that uniquely identifies a product.
             /// </param>
-            /// <param name='body'>
-            /// Update auto renew request parameters.
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the validate move eligibility
+            /// operation.
             /// </param>
-            public static UpdateAutoRenewOperation UpdateAutoRenewByInvoiceSection(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, UpdateAutoRenewRequest body)
+            public static ValidateProductTransferEligibilityResult ValidateMove(this IProductsOperations operations, string billingAccountName, string productName, TransferProductRequestProperties parameters)
             {
-                return operations.UpdateAutoRenewByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, body).GetAwaiter().GetResult();
+                return operations.ValidateMoveAsync(billingAccountName, productName, parameters).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Cancel auto renew for product by product id and invoice section name
+            /// Validates if a product's charges can be moved to a new invoice section.
+            /// This operation is supported only for products that are purchased with a
+            /// recurring charge and for billing accounts with agreement type Microsoft
+            /// Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// <param name='productName'>
+            /// The ID that uniquely identifies a product.
             /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
+            /// <param name='parameters'>
+            /// Request parameters that are provided to the validate move eligibility
+            /// operation.
             /// </param>
-            /// <param name='productName'>
-            /// Invoice Id.
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<ValidateProductTransferEligibilityResult> ValidateMoveAsync(this IProductsOperations operations, string billingAccountName, string productName, TransferProductRequestProperties parameters, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ValidateMoveWithHttpMessagesAsync(billingAccountName, productName, parameters, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the products for a customer. These don't include products billed
+            /// based on usage.The operation is supported only for billing accounts with
+            /// agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
             /// </param>
-            /// <param name='body'>
-            /// Update auto renew request parameters.
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
+            /// </param>
+            public static IPage<Product> ListByCustomerNext(this IProductsOperations operations, string nextPageLink)
+            {
+                return operations.ListByCustomerNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the products for a customer. These don't include products billed
+            /// based on usage.The operation is supported only for billing accounts with
+            /// agreement type Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<UpdateAutoRenewOperation> UpdateAutoRenewByInvoiceSectionAsync(this IProductsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string productName, UpdateAutoRenewRequest body, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Product>> ListByCustomerNextAsync(this IProductsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.UpdateAutoRenewByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, productName, body, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByCustomerNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists products by billing account name.
+            /// Lists the products for a billing account. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -475,7 +505,9 @@ public static IPage<Product> ListByBillingAccountNext(this IProductsOperations o
             }
 
             /// <summary>
-            /// Lists products by billing account name.
+            /// Lists the products for a billing account. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -495,5 +527,85 @@ public static IPage<Product> ListByBillingAccountNext(this IProductsOperations o
                 }
             }
 
+            /// <summary>
+            /// Lists the products for a billing profile. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Product> ListByBillingProfileNext(this IProductsOperations operations, string nextPageLink)
+            {
+                return operations.ListByBillingProfileNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the products for a billing profile. These don't include products
+            /// billed based on usage. The operation is supported for billing accounts with
+            /// agreement type Microsoft Customer Agreement or Microsoft Partner Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Product>> ListByBillingProfileNextAsync(this IProductsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByBillingProfileNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// Lists the products for an invoice section. These don't include products
+            /// billed based on usage. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Product> ListByInvoiceSectionNext(this IProductsOperations operations, string nextPageLink)
+            {
+                return operations.ListByInvoiceSectionNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// Lists the products for an invoice section. These don't include products
+            /// billed based on usage. The operation is supported only for billing accounts
+            /// with agreement type Microsoft Customer Agreement.
+            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
+            /// </summary>
+            /// <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<Product>> ListByInvoiceSectionNextAsync(this IProductsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListByInvoiceSectionNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
     }
 }
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/SdkInfo_BillingManagementClient.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/SdkInfo_BillingManagementClient.cs
index 0f3cc0d1d42fa..8b3c30035787b 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/SdkInfo_BillingManagementClient.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/SdkInfo_BillingManagementClient.cs
@@ -19,45 +19,26 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_BillingManageme
           {
               return new Tuple<string, string, string>[]
               {
-                new Tuple<string, string, string>("Billing", "Address", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Agreements", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "AvailableBalances", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingAccounts", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingPermissions", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingProfiles", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingProperty", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingRoleAssignments", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingRoleDefinitions", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "BillingSubscriptions", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Customers", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Departments", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "EnrollmentAccounts", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "InvoiceSections", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Invoices", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "LineOfCredits", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Operations", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "PartnerTransfers", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "PartnerTransfersTransfers", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "PaymentMethods", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Policies", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "PriceSheet", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Products", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "RecipientTransfers", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Transactions", "2019-10-01-preview"),
-                new Tuple<string, string, string>("Billing", "Transfers", "2019-10-01-preview"),
+                new Tuple<string, string, string>("Billing", "Address", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Agreements", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "AvailableBalances", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingAccounts", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingPermissions", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingProfiles", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingProperty", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingRoleAssignments", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingRoleDefinitions", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "BillingSubscriptions", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Customers", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Instructions", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "InvoiceSections", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Invoices", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Operations", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Policies", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Products", "2020-05-01"),
+                new Tuple<string, string, string>("Billing", "Transactions", "2020-05-01"),
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4407";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/billing/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\Users\\ansar\\Documents\\GitHub\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "998331a0fa9d2e7897bc689787d74caeb60779d7";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperations.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperations.cs
index 942f120bea52a..b0fe0e9a99116 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperations.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperations.cs
@@ -51,914 +51,15 @@ internal TransactionsOperations(BillingManagementClient client)
         public BillingManagementClient Client { get; private set; }
 
         /// <summary>
-        /// Lists the transactions by customer id for given start date and end date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='customerName'>
-        /// Customer name.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
-        /// separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<Transaction>>> ListByCustomerWithHttpMessagesAsync(string billingAccountName, string customerName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (customerName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "customerName");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (periodStartDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodStartDate");
-            }
-            if (periodEndDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodEndDate");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("customerName", customerName);
-                tracingParameters.Add("periodStartDate", periodStartDate);
-                tracingParameters.Add("periodEndDate", periodEndDate);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByCustomer", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/transactions").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{customerName}", System.Uri.EscapeDataString(customerName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (periodStartDate != null)
-            {
-                _queryParameters.Add(string.Format("periodStartDate={0}", System.Uri.EscapeDataString(periodStartDate)));
-            }
-            if (periodEndDate != null)
-            {
-                _queryParameters.Add(string.Format("periodEndDate={0}", System.Uri.EscapeDataString(periodEndDate)));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
-            }
-            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Transaction>>();
-            _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<Transaction>>(_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>
-        /// Lists the transactions by billing account name for given start and end
-        /// date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
-        /// separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<Transaction>>> ListByBillingAccountWithHttpMessagesAsync(string billingAccountName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (periodStartDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodStartDate");
-            }
-            if (periodEndDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodEndDate");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("periodStartDate", periodStartDate);
-                tracingParameters.Add("periodEndDate", periodEndDate);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccount", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/transactions").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (periodStartDate != null)
-            {
-                _queryParameters.Add(string.Format("periodStartDate={0}", System.Uri.EscapeDataString(periodStartDate)));
-            }
-            if (periodEndDate != null)
-            {
-                _queryParameters.Add(string.Format("periodEndDate={0}", System.Uri.EscapeDataString(periodEndDate)));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
-            }
-            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Transaction>>();
-            _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<Transaction>>(_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>
-        /// Lists the transactions by billing profile name for given start date and end
-        /// date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
-        /// separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<TransactionListResult>> ListByBillingProfileWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (periodStartDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodStartDate");
-            }
-            if (periodEndDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodEndDate");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("periodStartDate", periodStartDate);
-                tracingParameters.Add("periodEndDate", periodEndDate);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingProfile", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/transactions").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (periodStartDate != null)
-            {
-                _queryParameters.Add(string.Format("periodStartDate={0}", System.Uri.EscapeDataString(periodStartDate)));
-            }
-            if (periodEndDate != null)
-            {
-                _queryParameters.Add(string.Format("periodEndDate={0}", System.Uri.EscapeDataString(periodEndDate)));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
-            }
-            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<TransactionListResult>();
-            _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<TransactionListResult>(_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>
-        /// Lists the transactions by invoice section name for given start date and end
-        /// date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-        /// </summary>
-        /// <param name='billingAccountName'>
-        /// billing Account Id.
-        /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='invoiceSectionName'>
-        /// InvoiceSection Id.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
-        /// </param>
-        /// <param name='filter'>
-        /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-        /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-        /// 'not'. Tag filter is a key value pair string where key and value is
-        /// separated by a colon (:).
-        /// </param>
-        /// <param name='customHeaders'>
-        /// Headers that will be added to request.
-        /// </param>
-        /// <param name='cancellationToken'>
-        /// The cancellation token.
-        /// </param>
-        /// <exception cref="ErrorResponseException">
-        /// 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<TransactionListResult>> ListByInvoiceSectionWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string invoiceSectionName, string periodStartDate, string periodEndDate, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (billingAccountName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
-            }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (invoiceSectionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceSectionName");
-            }
-            if (Client.ApiVersion == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion");
-            }
-            if (periodStartDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodStartDate");
-            }
-            if (periodEndDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodEndDate");
-            }
-            // Tracing
-            bool _shouldTrace = ServiceClientTracing.IsEnabled;
-            string _invocationId = null;
-            if (_shouldTrace)
-            {
-                _invocationId = ServiceClientTracing.NextInvocationId.ToString();
-                Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
-                tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("invoiceSectionName", invoiceSectionName);
-                tracingParameters.Add("periodStartDate", periodStartDate);
-                tracingParameters.Add("periodEndDate", periodEndDate);
-                tracingParameters.Add("filter", filter);
-                tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceSection", tracingParameters);
-            }
-            // Construct URL
-            var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/transactions").ToString();
-            _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{invoiceSectionName}", System.Uri.EscapeDataString(invoiceSectionName));
-            List<string> _queryParameters = new List<string>();
-            if (Client.ApiVersion != null)
-            {
-                _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
-            }
-            if (periodStartDate != null)
-            {
-                _queryParameters.Add(string.Format("periodStartDate={0}", System.Uri.EscapeDataString(periodStartDate)));
-            }
-            if (periodEndDate != null)
-            {
-                _queryParameters.Add(string.Format("periodEndDate={0}", System.Uri.EscapeDataString(periodEndDate)));
-            }
-            if (filter != null)
-            {
-                _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
-            }
-            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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<TransactionListResult>();
-            _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<TransactionListResult>(_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 transaction.
+        /// Lists the transactions for an invoice. Transactions include purchases,
+        /// refunds and Azure usage charges.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='billingAccountName'>
-        /// billing Account Id.
+        /// The ID that uniquely identifies a billing account.
         /// </param>
-        /// <param name='billingProfileName'>
-        /// Billing Profile Id.
-        /// </param>
-        /// <param name='transactionName'>
-        /// Transaction name.
-        /// </param>
-        /// <param name='periodStartDate'>
-        /// Start date
-        /// </param>
-        /// <param name='periodEndDate'>
-        /// End date
+        /// <param name='invoiceName'>
+        /// The ID that uniquely identifies an invoice.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -981,27 +82,15 @@ internal TransactionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<Transaction>> GetWithHttpMessagesAsync(string billingAccountName, string billingProfileName, string transactionName, string periodStartDate, string periodEndDate, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Transaction>>> ListByInvoiceWithHttpMessagesAsync(string billingAccountName, string invoiceName, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (billingAccountName == null)
             {
                 throw new ValidationException(ValidationRules.CannotBeNull, "billingAccountName");
             }
-            if (billingProfileName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "billingProfileName");
-            }
-            if (transactionName == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "transactionName");
-            }
-            if (periodStartDate == null)
-            {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodStartDate");
-            }
-            if (periodEndDate == null)
+            if (invoiceName == null)
             {
-                throw new ValidationException(ValidationRules.CannotBeNull, "periodEndDate");
+                throw new ValidationException(ValidationRules.CannotBeNull, "invoiceName");
             }
             if (Client.ApiVersion == null)
             {
@@ -1015,28 +104,16 @@ internal TransactionsOperations(BillingManagementClient client)
                 _invocationId = ServiceClientTracing.NextInvocationId.ToString();
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("billingAccountName", billingAccountName);
-                tracingParameters.Add("billingProfileName", billingProfileName);
-                tracingParameters.Add("transactionName", transactionName);
-                tracingParameters.Add("periodStartDate", periodStartDate);
-                tracingParameters.Add("periodEndDate", periodEndDate);
+                tracingParameters.Add("invoiceName", invoiceName);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoice", tracingParameters);
             }
             // Construct URL
             var _baseUrl = Client.BaseUri.AbsoluteUri;
-            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/transactions/{transactionName}").ToString();
+            var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/invoices/{invoiceName}/transactions").ToString();
             _url = _url.Replace("{billingAccountName}", System.Uri.EscapeDataString(billingAccountName));
-            _url = _url.Replace("{billingProfileName}", System.Uri.EscapeDataString(billingProfileName));
-            _url = _url.Replace("{transactionName}", System.Uri.EscapeDataString(transactionName));
+            _url = _url.Replace("{invoiceName}", System.Uri.EscapeDataString(invoiceName));
             List<string> _queryParameters = new List<string>();
-            if (periodStartDate != null)
-            {
-                _queryParameters.Add(string.Format("periodStartDate={0}", System.Uri.EscapeDataString(periodStartDate)));
-            }
-            if (periodEndDate != null)
-            {
-                _queryParameters.Add(string.Format("periodEndDate={0}", System.Uri.EscapeDataString(periodEndDate)));
-            }
             if (Client.ApiVersion != null)
             {
                 _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
@@ -1065,175 +142,6 @@ internal TransactionsOperations(BillingManagementClient 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 ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
-                try
-                {
-                    _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                    ErrorResponse _errorBody =  Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_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<Transaction>();
-            _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<Transaction>(_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>
-        /// Lists the transactions by customer id for given start date and end date.
-        /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-        /// </summary>
-        /// <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="ErrorResponseException">
-        /// 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<Transaction>>> ListByCustomerNextWithHttpMessagesAsync(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, "ListByCustomerNext", 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)
@@ -1331,8 +239,8 @@ internal TransactionsOperations(BillingManagementClient client)
         }
 
         /// <summary>
-        /// Lists the transactions by billing account name for given start and end
-        /// date.
+        /// Lists the transactions for an invoice. Transactions include purchases,
+        /// refunds and Azure usage charges.
         /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
         /// </summary>
         /// <param name='nextPageLink'>
@@ -1359,7 +267,7 @@ internal TransactionsOperations(BillingManagementClient client)
         /// <return>
         /// A response object containing the response body and response headers.
         /// </return>
-        public async Task<AzureOperationResponse<IPage<Transaction>>> ListByBillingAccountNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
+        public async Task<AzureOperationResponse<IPage<Transaction>>> ListByInvoiceNextWithHttpMessagesAsync(string nextPageLink, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
         {
             if (nextPageLink == null)
             {
@@ -1374,7 +282,7 @@ internal TransactionsOperations(BillingManagementClient client)
                 Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
                 tracingParameters.Add("nextPageLink", nextPageLink);
                 tracingParameters.Add("cancellationToken", cancellationToken);
-                ServiceClientTracing.Enter(_invocationId, this, "ListByBillingAccountNext", tracingParameters);
+                ServiceClientTracing.Enter(_invocationId, this, "ListByInvoiceNext", tracingParameters);
             }
             // Construct URL
             string _url = "{nextLink}";
diff --git a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperationsExtensions.cs b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperationsExtensions.cs
index 882a02d6b544a..9273d6443e9eb 100644
--- a/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperationsExtensions.cs
+++ b/sdk/billing/Microsoft.Azure.Management.Billing/src/Generated/TransactionsOperationsExtensions.cs
@@ -22,374 +22,52 @@ namespace Microsoft.Azure.Management.Billing
     public static partial class TransactionsOperationsExtensions
     {
             /// <summary>
-            /// Lists the transactions by customer id for given start date and end date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            public static IPage<Transaction> ListByCustomer(this ITransactionsOperations operations, string billingAccountName, string customerName, string periodStartDate, string periodEndDate, string filter = default(string))
-            {
-                return operations.ListByCustomerAsync(billingAccountName, customerName, periodStartDate, periodEndDate, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the transactions by customer id for given start date and end date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='customerName'>
-            /// Customer name.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<Transaction>> ListByCustomerAsync(this ITransactionsOperations operations, string billingAccountName, string customerName, string periodStartDate, string periodEndDate, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByCustomerWithHttpMessagesAsync(billingAccountName, customerName, periodStartDate, periodEndDate, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the transactions by billing account name for given start and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            public static IPage<Transaction> ListByBillingAccount(this ITransactionsOperations operations, string billingAccountName, string periodStartDate, string periodEndDate, string filter = default(string))
-            {
-                return operations.ListByBillingAccountAsync(billingAccountName, periodStartDate, periodEndDate, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the transactions by billing account name for given start and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<IPage<Transaction>> ListByBillingAccountAsync(this ITransactionsOperations operations, string billingAccountName, string periodStartDate, string periodEndDate, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingAccountWithHttpMessagesAsync(billingAccountName, periodStartDate, periodEndDate, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the transactions by billing profile name for given start date and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            public static TransactionListResult ListByBillingProfile(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, string filter = default(string))
-            {
-                return operations.ListByBillingProfileAsync(billingAccountName, billingProfileName, periodStartDate, periodEndDate, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the transactions by billing profile name for given start date and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<TransactionListResult> ListByBillingProfileAsync(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string periodStartDate, string periodEndDate, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByBillingProfileWithHttpMessagesAsync(billingAccountName, billingProfileName, periodStartDate, periodEndDate, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the transactions by invoice section name for given start date and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            public static TransactionListResult ListByInvoiceSection(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string periodStartDate, string periodEndDate, string filter = default(string))
-            {
-                return operations.ListByInvoiceSectionAsync(billingAccountName, billingProfileName, invoiceSectionName, periodStartDate, periodEndDate, filter).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the transactions by invoice section name for given start date and end
-            /// date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='invoiceSectionName'>
-            /// InvoiceSection Id.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='filter'>
-            /// May be used to filter by transaction kind. The filter supports 'eq', 'lt',
-            /// 'gt', 'le', 'ge', and 'and'. It does not currently support 'ne', 'or', or
-            /// 'not'. Tag filter is a key value pair string where key and value is
-            /// separated by a colon (:).
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<TransactionListResult> ListByInvoiceSectionAsync(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string invoiceSectionName, string periodStartDate, string periodEndDate, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.ListByInvoiceSectionWithHttpMessagesAsync(billingAccountName, billingProfileName, invoiceSectionName, periodStartDate, periodEndDate, filter, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Get the transaction.
+            /// Lists the transactions for an invoice. Transactions include purchases,
+            /// refunds and Azure usage charges.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            /// <param name='transactionName'>
-            /// Transaction name.
+            /// <param name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
             /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            public static Transaction Get(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string transactionName, string periodStartDate, string periodEndDate)
+            public static IPage<Transaction> ListByInvoice(this ITransactionsOperations operations, string billingAccountName, string invoiceName)
             {
-                return operations.GetAsync(billingAccountName, billingProfileName, transactionName, periodStartDate, periodEndDate).GetAwaiter().GetResult();
+                return operations.ListByInvoiceAsync(billingAccountName, invoiceName).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Get the transaction.
+            /// Lists the transactions for an invoice. Transactions include purchases,
+            /// refunds and Azure usage charges.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
             /// The operations group for this extension method.
             /// </param>
             /// <param name='billingAccountName'>
-            /// billing Account Id.
-            /// </param>
-            /// <param name='billingProfileName'>
-            /// Billing Profile Id.
-            /// </param>
-            /// <param name='transactionName'>
-            /// Transaction name.
-            /// </param>
-            /// <param name='periodStartDate'>
-            /// Start date
-            /// </param>
-            /// <param name='periodEndDate'>
-            /// End date
-            /// </param>
-            /// <param name='cancellationToken'>
-            /// The cancellation token.
-            /// </param>
-            public static async Task<Transaction> GetAsync(this ITransactionsOperations operations, string billingAccountName, string billingProfileName, string transactionName, string periodStartDate, string periodEndDate, CancellationToken cancellationToken = default(CancellationToken))
-            {
-                using (var _result = await operations.GetWithHttpMessagesAsync(billingAccountName, billingProfileName, transactionName, periodStartDate, periodEndDate, null, cancellationToken).ConfigureAwait(false))
-                {
-                    return _result.Body;
-                }
-            }
-
-            /// <summary>
-            /// Lists the transactions by customer id for given start date and end date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-            /// </summary>
-            /// <param name='operations'>
-            /// The operations group for this extension method.
-            /// </param>
-            /// <param name='nextPageLink'>
-            /// The NextLink from the previous successful call to List operation.
+            /// The ID that uniquely identifies a billing account.
             /// </param>
-            public static IPage<Transaction> ListByCustomerNext(this ITransactionsOperations operations, string nextPageLink)
-            {
-                return operations.ListByCustomerNextAsync(nextPageLink).GetAwaiter().GetResult();
-            }
-
-            /// <summary>
-            /// Lists the transactions by customer id for given start date and end date.
-            /// <see href="https://docs.microsoft.com/en-us/rest/api/consumption/" />
-            /// </summary>
-            /// <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 name='invoiceName'>
+            /// The ID that uniquely identifies an invoice.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Transaction>> ListByCustomerNextAsync(this ITransactionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Transaction>> ListByInvoiceAsync(this ITransactionsOperations operations, string billingAccountName, string invoiceName, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByCustomerNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByInvoiceWithHttpMessagesAsync(billingAccountName, invoiceName, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }
             }
 
             /// <summary>
-            /// Lists the transactions by billing account name for given start and end
-            /// date.
+            /// Lists the transactions for an invoice. Transactions include purchases,
+            /// refunds and Azure usage charges.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -398,14 +76,14 @@ public static IPage<Transaction> ListByCustomerNext(this ITransactionsOperations
             /// <param name='nextPageLink'>
             /// The NextLink from the previous successful call to List operation.
             /// </param>
-            public static IPage<Transaction> ListByBillingAccountNext(this ITransactionsOperations operations, string nextPageLink)
+            public static IPage<Transaction> ListByInvoiceNext(this ITransactionsOperations operations, string nextPageLink)
             {
-                return operations.ListByBillingAccountNextAsync(nextPageLink).GetAwaiter().GetResult();
+                return operations.ListByInvoiceNextAsync(nextPageLink).GetAwaiter().GetResult();
             }
 
             /// <summary>
-            /// Lists the transactions by billing account name for given start and end
-            /// date.
+            /// Lists the transactions for an invoice. Transactions include purchases,
+            /// refunds and Azure usage charges.
             /// <see href="https://docs.microsoft.com/en-us/rest/api/billing/" />
             /// </summary>
             /// <param name='operations'>
@@ -417,9 +95,9 @@ public static IPage<Transaction> ListByBillingAccountNext(this ITransactionsOper
             /// <param name='cancellationToken'>
             /// The cancellation token.
             /// </param>
-            public static async Task<IPage<Transaction>> ListByBillingAccountNextAsync(this ITransactionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            public static async Task<IPage<Transaction>> ListByInvoiceNextAsync(this ITransactionsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
             {
-                using (var _result = await operations.ListByBillingAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                using (var _result = await operations.ListByInvoiceNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
                 {
                     return _result.Body;
                 }